diff --git a/README.md b/README.md index 081efa0..06d2640 100644 --- a/README.md +++ b/README.md @@ -29,17 +29,17 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - Tested on: - CentOS Stream 8 (Minimal) - - K3s v1.27.6+k3s1 + - K3s v1.27.7+k3s1 - Products that will be deployed: - - AWX Operator 2.7.1 - - AWX 23.3.1 + - AWX Operator 2.7.2 + - AWX 23.4.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.3.1/INSTALL.md) @23.3.1 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.7.1/README.md) @2.7.1 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.4.0/INSTALL.md) @23.4.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.7.2/README.md) @2.7.2 ## Requirements @@ -76,10 +76,10 @@ sudo dnf install -y git curl ### Install K3s -Install K3s with `--write-kubeconfig-mode 644` to make config file (`/etc/rancher/k3s/k3s.yaml`) readable by non-root user. +Install specific version of K3s with `--write-kubeconfig-mode 644` to make config file (`/etc/rancher/k3s/k3s.yaml`) readable by non-root user. ```bash -curl -sfL https://get.k3s.io | sh -s - --write-kubeconfig-mode 644 +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.27.7+k3s1 sh -s - --write-kubeconfig-mode 644 ``` ### Install AWX Operator @@ -88,15 +88,15 @@ Clone this repository and change directory. If you want to use files suitable for the specific version of AWX Operator, [refer tags in this repository](https://github.com/kurokobo/awx-on-k3s/tags) and specify desired tag in `git checkout`. Especially for `0.13.0` or earlier version of AWX Operator, refer to [📝Tips: Deploy older version of AWX Operator](tips/deploy-older-operator.md). -**⚠️Note for 2.7.0 and 2.7.1⚠️** +**⚠️Note for 2.7.0 through 2.7.2⚠️** -**AWX Operator 2.7.0 and 2.7.1 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.** +**AWX Operator 2.7.0 through 2.7.2 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.** ```bash cd ~ git clone https://github.com/kurokobo/awx-on-k3s.git cd awx-on-k3s -git checkout 2.7.1 +git checkout 2.7.2 ``` Then invoke `kubectl apply -k operator` to deploy AWX Operator. diff --git a/acme/README.md b/acme/README.md index 5eedc19..b8b0ef0 100644 --- a/acme/README.md +++ b/acme/README.md @@ -42,7 +42,7 @@ This guide does not provide any information how to configure Azure, other DNS se Deploy cert-manager first. ```bash -kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.1/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml ``` Ensure the pods in `cert-manager` namespace are running. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 9b8c67b..4d36a5f 100644 --- a/backup/ansible/README.md +++ b/backup/ansible/README.md @@ -32,7 +32,7 @@ An example simple playbook for Ansible is also provided in this repository. This | - | - | - | | `awxbackup_namespace` | The name of the NameSpace where the `AWXBackup` resource will be created. | `awx` | | `awxbackup_name` | The name of the `AWXBackup` resource. Dynamically generated using execution time by default. | `awxbackup-{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M-%S') }}` | -| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.7.1/roles/backup) for acceptable fields. | `deployment_name: awx`
`backup_pvc: awx-backup-claim`
`clean_backup_on_delete: true` | +| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.7.2/roles/backup) for acceptable fields. | `deployment_name: awx`
`backup_pvc: awx-backup-claim`
`clean_backup_on_delete: true` | | `awxbackup_timeout` | Time to wait for backup to complete, in seconds. If exceeded, the playbook will fail. | `600` | | `awxbackup_keep_days` | Number of days to keep `AWXBackup` resources. `AWXBackup` resources older than this value will be deleted by this playbook. Set `0` to keep forever. | `30` | diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index 2711a36..4467e6d 100644 --- a/operator/kustomization.yaml +++ b/operator/kustomization.yaml @@ -12,8 +12,8 @@ secretGenerator: - operator=awx resources: - - github.com/ansible/awx-operator/config/default?ref=2.7.1 + - github.com/ansible/awx-operator/config/default?ref=2.7.2 images: - name: quay.io/ansible/awx-operator - newTag: 2.7.1 + newTag: 2.7.2 diff --git a/restore/README.md b/restore/README.md index f9148d4..73a28ff 100644 --- a/restore/README.md +++ b/restore/README.md @@ -73,7 +73,7 @@ If you want to restore from AWXBackup object, specify its name in `restore/awxre ... ``` -If the AWXBackup object no longer exists, place the backup files under `/data/backup/` (e.g. `/data/backup/tower-openshift-backup-2021-06-06-10:51:49`) and specify the name of the PVC and directory in `restore/awxrestore.yaml`. **⚠️This method does not work on AWX Operator 2.7.0 and 2.7.1 due to [#1586](https://github.com/ansible/awx-operator/issues/1586).** +If the AWXBackup object no longer exists, place the backup files under `/data/backup/` (e.g. `/data/backup/tower-openshift-backup-2021-06-06-10:51:49`) and specify the name of the PVC and directory in `restore/awxrestore.yaml`. **⚠️This method does not work on AWX Operator 2.7.0 through 2.7.2 due to [#1586](https://github.com/ansible/awx-operator/issues/1586).** ```yaml ... diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index 1fe9f42..e5c9084 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -11,9 +11,9 @@ Note that once you upgrade AWX Operator, your AWX will also be upgraded automati [There is `image_version` parameter for AWX resource to change which image will be used](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html), but it appears that using a version of AWX other than the one bundled with the AWX Operator [is currently not supported](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html). Conversely, if you want to upgrade AWX, you need to plan to upgrade AWX Operator first. -**⚠️Note for 2.7.0 and 2.7.1⚠️** +**⚠️Note for 2.7.0 through 2.7.2⚠️** -**AWX Operator 2.7.0 and 2.7.1 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.** +**AWX Operator 2.7.0 through 2.7.2 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.** ## Table of Contents diff --git a/tips/version-mapping.md b/tips/version-mapping.md index b3c9337..642a636 100644 --- a/tips/version-mapping.md +++ b/tips/version-mapping.md @@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions. | AWX Operator | AWX | | - | - | +| 2.7.2 | 23.4.0 | | 2.7.1 | 23.3.1 | | 2.7.0 | 23.3.0 | | 2.6.0 | 23.2.0 |