From 5cdf37dfb620fb96606f8c29652d6814d4cd18a7 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Mon, 18 Jul 2022 13:22:52 +0900 Subject: [PATCH] feat: bump awx operator version to 0.25.0 --- README.md | 8 ++++---- backup/README.md | 2 +- backup/ansible/README.md | 2 +- base/awx.yaml | 4 ++-- restore/README.md | 2 +- tips/troubleshooting.md | 2 +- tips/version-mapping.md | 1 + 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5373a39..b0f64dc 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - CentOS Stream 8 (Minimal) - K3s v1.23.8+k3s2 - Products that will be deployed: - - AWX Operator 0.24.0 + - AWX Operator 0.25.0 - AWX 21.3.0 - PostgreSQL 12 @@ -37,7 +37,7 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - [K3s - Lightweight Kubernetes](https://rancher.com/docs/k3s/latest/en/) - [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.3.0/INSTALL.md) @21.3.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.24.0/README.md) @0.24.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.25.0/README.md) @0.25.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.24.0 +git checkout 0.25.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`. @@ -190,7 +190,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-mana ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* -localhost : ok=65 changed=0 unreachable=0 failed=0 skipped=44 rescued=0 ignored=0 +localhost : ok=67 changed=0 unreachable=0 failed=0 skipped=44 rescued=0 ignored=0 ``` Required objects has been deployed next to AWX Operator in `awx` namespace. diff --git a/backup/README.md b/backup/README.md index 8c512cd..1b9889f 100644 --- a/backup/README.md +++ b/backup/README.md @@ -63,7 +63,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-mana ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWXBackup, awxbackup-2021-06-06/awx) ----- PLAY RECAP ********************************************************************* -localhost : ok=3 changed=0 unreachable=0 failed=0 skipped=7 rescued=0 ignored=0 +localhost : ok=4 changed=0 unreachable=0 failed=0 skipped=8 rescued=0 ignored=0 ``` This will create AWXBackup object in the namespace and also create backup files in the Persistent Volume. In this example those files are available at `/data/backup`. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 64c93cb..4be4ba3 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/0.24.0/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/0.25.0/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/base/awx.yaml b/base/awx.yaml index c60f477..ac18e55 100644 --- a/base/awx.yaml +++ b/base/awx.yaml @@ -5,8 +5,8 @@ metadata: name: awx spec: # These parameters are designed for use with: - # - AWX Operator: 0.24.0 - # https://github.com/ansible/awx-operator/blob/0.24.0/README.md + # - AWX Operator: 0.25.0 + # https://github.com/ansible/awx-operator/blob/0.25.0/README.md # - AWX: 21.3.0 # https://github.com/ansible/awx/blob/21.3.0/INSTALL.md diff --git a/restore/README.md b/restore/README.md index f9c9aca..a99ee27 100644 --- a/restore/README.md +++ b/restore/README.md @@ -102,7 +102,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-mana ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* -localhost : ok=67 changed=0 unreachable=0 failed=0 skipped=42 rescued=0 ignored=0 +localhost : ok=69 changed=0 unreachable=0 failed=0 skipped=42 rescued=0 ignored=0 ``` This will create AWXRestore object in the namespace, and now your AWX is restored. diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md index 3d80542..2439c26 100644 --- a/tips/troubleshooting.md +++ b/tips/troubleshooting.md @@ -179,7 +179,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.24.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.25.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 d88364f..1bda13c 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.25.0 | 21.3.0 | | 0.24.0 | 21.3.0 | | 0.23.0 | 21.2.0 | | 0.22.0 | 21.1.0 |