diff --git a/README.md b/README.md index 974c4ee..cde36ee 100644 --- a/README.md +++ b/README.md @@ -29,15 +29,15 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - CentOS Stream 8 (Minimal) - K3s v1.23.6+k3s1 - Products that will be deployed: - - AWX Operator 0.22.0 - - AWX 21.1.0 + - AWX Operator 0.23.0 + - AWX 21.2.0 - PostgreSQL 12 ## References - [K3s - Lightweight Kubernetes](https://rancher.com/docs/k3s/latest/en/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.1.0/INSTALL.md) @21.1.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.22.0/README.md) @0.22.0 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.2.0/INSTALL.md) @21.2.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.23.0/README.md) @0.23.0 ## Requirements @@ -83,7 +83,7 @@ Install specified version of AWX Operator. Note that this procedure is applicabl cd ~ git clone https://github.com/ansible/awx-operator.git cd awx-operator -git checkout 0.22.0 +git checkout 0.23.0 ``` Export the name of the namespace where you want to deploy AWX Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `awx`. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index b41b964..5e7ccf1 100644 --- a/backup/ansible/README.md +++ b/backup/ansible/README.md @@ -30,7 +30,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/0.22.0/roles/backup) for acceptable fields. | `{'deployment_name':'awx','backup_pvc':'awx-backup-claim'}` | +| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/0.23.0/roles/backup) for acceptable fields. | `{'deployment_name':'awx','backup_pvc':'awx-backup-claim'}` | | `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. **Note that the actual backup data will remain in the PVC after the `AWXBackup` resource is deleted.** | `30` | diff --git a/base/awx.yaml b/base/awx.yaml index 69891c7..0a7a5d8 100644 --- a/base/awx.yaml +++ b/base/awx.yaml @@ -5,10 +5,10 @@ metadata: name: awx spec: # These parameters are designed for use with: - # - AWX Operator: 0.22.0 - # https://github.com/ansible/awx-operator/blob/0.22.0/README.md - # - AWX: 21.1.0 - # https://github.com/ansible/awx/blob/21.1.0/INSTALL.md + # - AWX Operator: 0.23.0 + # https://github.com/ansible/awx-operator/blob/0.23.0/README.md + # - AWX: 21.2.0 + # https://github.com/ansible/awx/blob/21.2.0/INSTALL.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/base/kustomization.yaml b/base/kustomization.yaml index 565d8bf..98091e9 100644 --- a/base/kustomization.yaml +++ b/base/kustomization.yaml @@ -28,7 +28,7 @@ secretGenerator: literals: - password=Ansible123! - # Temporary workaround to suppress errors from AWX Operator 0.22.0. + # Temporary workaround to suppress errors from AWX Operator 0.23.0. # Refer: https://github.com/kurokobo/awx-on-k3s/issues/74 - name: redhat-operators-pull-secret files: diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md index b8e24ae..f774328 100644 --- a/tips/troubleshooting.md +++ b/tips/troubleshooting.md @@ -153,7 +153,7 @@ Typical solutions are one of the following: ee_resource_requirements: {} 👈👈👈 ``` - - You can specify more specific value for each containers. Refer [official documentation](https://github.com/ansible/awx-operator/blob/0.22.0/README.md#containers-resource-requirements) for details. + - You can specify more specific value for each containers. Refer [official documentation](https://github.com/ansible/awx-operator/blob/0.23.0/README.md#containers-resource-requirements) for details. - In this way you can run AWX with fewer resources, but you may encounter performance issues. ### The Pod is `Pending` with "1 pod has unbound immediate PersistentVolumeClaims." event diff --git a/tips/version-mapping.md b/tips/version-mapping.md index fe83121..9fc9ef6 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 | | - | - | +| 0.23.0 | 21.2.0 | | 0.22.0 | 21.1.0 | | 0.21.0 | 21.0.0 | | 0.20.2 | 21.0.0 |