From e19c05e2414e2c62ecfdfd561644ebff0b30d1e7 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:18:39 +0900 Subject: [PATCH] feat: bump operator version to 2.6.0 --- README.md | 16 ++++++++++------ acme/README.md | 2 +- backup/README.md | 4 ++++ backup/ansible/README.md | 2 +- backup/awxbackup.yaml | 3 +-- galaxy/pulp/galaxy.yaml | 8 ++++---- operator/kustomization.yaml | 4 ++-- tips/upgrade-operator.md | 6 +++++- tips/version-mapping.md | 1 + 9 files changed, 29 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index cc8a4b2..9e63ac2 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.5+k3s1 + - K3s v1.27.6+k3s1 - Products that will be deployed: - - AWX Operator 2.5.3 - - AWX 23.1.0 + - AWX Operator 2.6.0 + - AWX 23.2.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.1.0/INSTALL.md) @23.1.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.5.3/README.md) @2.5.3 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.2.0/INSTALL.md) @23.2.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.6.0/README.md) @2.6.0 ## Requirements @@ -88,11 +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.6.0⚠️** + +**I recommend to avoid using 2.6.0 because of bugs ([#1570](https://github.com/ansible/awx-operator/issues/1570), [#1572](https://github.com/ansible/awx-operator/issues/1572), and [#14486](https://github.com/ansible/awx/issues/14486)) that causes upgrading and backups to fail.** + ```bash cd ~ git clone https://github.com/kurokobo/awx-on-k3s.git cd awx-on-k3s -git checkout 2.5.3 +git checkout 2.6.0 ``` Then invoke `kubectl apply -k operator` to deploy AWX Operator. diff --git a/acme/README.md b/acme/README.md index 3296019..5eedc19 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.0/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.1/cert-manager.yaml ``` Ensure the pods in `cert-manager` namespace are running. diff --git a/backup/README.md b/backup/README.md index 9f0afa6..ba27ada 100644 --- a/backup/README.md +++ b/backup/README.md @@ -7,6 +7,10 @@ This guide is specifically designed to use with the AWX which deployed using [th You can also refer [the official instructions](https://github.com/ansible/awx-operator/tree/devel/roles/backup) for more information. +**⚠️Note for 2.6.0⚠️** + +**I recommend to avoid using 2.6.0 because of bugs ([#1570](https://github.com/ansible/awx-operator/issues/1570) and [#1572](https://github.com/ansible/awx-operator/issues/1572)) that causes backups to fail.** + ## Table of Contents diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 3e2ea17..a88a846 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.5.3/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.6.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/backup/awxbackup.yaml b/backup/awxbackup.yaml index c842178..bd78d48 100644 --- a/backup/awxbackup.yaml +++ b/backup/awxbackup.yaml @@ -2,11 +2,10 @@ apiVersion: awx.ansible.com/v1beta1 kind: AWXBackup metadata: - name: awxbackup-2021-06-06 + name: awxbackup-2023-09-29 namespace: awx spec: deployment_name: awx - backup_pvc: awx-backup-claim # Uncomment to reveal "censored" logs #no_log: false diff --git a/galaxy/pulp/galaxy.yaml b/galaxy/pulp/galaxy.yaml index 7f90e03..edb2f8c 100644 --- a/galaxy/pulp/galaxy.yaml +++ b/galaxy/pulp/galaxy.yaml @@ -6,15 +6,15 @@ spec: # These parameters are designed for use with: # - Pulp Operator: 1.0.0-beta.1 # https://github.com/pulp/pulp-operator/blob/1.0.0-beta.1/README.md - # - Galaxy NG: 4.7.1 - # https://github.com/ansible/galaxy_ng/tree/4.7.1 + # - Galaxy NG: 4.8.0 + # https://github.com/ansible/galaxy_ng/tree/4.8.0 deployment_type: galaxy image: quay.io/pulp/galaxy - image_version: 4.7.1 + image_version: 4.8.0 image_web: quay.io/pulp/galaxy-web - image_web_version: 4.7.1 + image_web_version: 4.8.0 admin_password_secret: galaxy-admin-password diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index 59f89f7..8e7cbf1 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.5.3 + - github.com/ansible/awx-operator/config/default?ref=2.6.0 images: - name: quay.io/ansible/awx-operator - newTag: 2.5.3 + newTag: 2.6.0 diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index 0b784e9..a837160 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -11,6 +11,10 @@ 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.6.0⚠️** + +**I recommend to avoid using 2.6.0 because of bugs ([#14486](https://github.com/ansible/awx/issues/14486)) that causes upgrading to fail.** + ## Table of Contents @@ -118,7 +122,7 @@ sudo rm -rf /data/postgres ## 📝 Upgrade from `0.13.0` (e.g. from `0.13.0` to `0.14.0`) -If you are using AWX Operator `0.13.0` and want to upgrade to newer version, you should consider the big changes in AWX Operator in `0.14.0`. [As described in the documentation](https://github.com/ansible/awx-operator/blob/2.5.3/docs/upgrade/upgrading.md#v0140), in `0.14.0`, AWX Operator changed from cluster scope to namespace scope. Also, the Operator SDK `1.x` is used. +If you are using AWX Operator `0.13.0` and want to upgrade to newer version, you should consider the big changes in AWX Operator in `0.14.0`. [As described in the documentation](https://ansible.readthedocs.io/projects/awx-operator/en/latest/upgrade/upgrading.html#v0140), in `0.14.0`, AWX Operator changed from cluster scope to namespace scope. Also, the Operator SDK `1.x` is used. This means that upgrading from `0.13.0` to `0.14.0` or later requires a bit of finesse, such as cleaning the old AWX Operator. **If you are using `0.12.0` or earlier and want to upgrade to `0.14.0` or later, I recommend you to [upgrade to `0.13.0` first](#-upgrade-from-0120-or-earlier-eg-from-0120-to-0130) and then come back to here to avoid unintended issue.** diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 8ae1c1e..3d92c5b 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.6.0 | 23.2.0 | | 2.5.3 | 23.1.0 | | 2.5.2 | 23.0.0 | | 2.5.1 | 22.7.0 |