From 10b0bfdec04d50a0d160c3c9bd44db243af3a2bb Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:41:49 +0900 Subject: [PATCH] feat: bump operator version to 2.12.0 --- README.md | 17 ++++++++++------- acme/README.md | 2 +- backup/ansible/README.md | 2 +- operator/kustomization.yaml | 4 ++-- runner/README.md | 2 +- tips/upgrade-operator.md | 3 +++ tips/version-mapping.md | 1 + 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 481529d..4fddfcc 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.28.5+k3s1 + - K3s v1.28.6+k3s2 - Products that will be deployed: - - AWX Operator 2.11.0 - - AWX 23.7.0 + - AWX Operator 2.12.0 + - AWX 23.8.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.7.0/INSTALL.md) @23.7.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.11.0/README.md) @2.11.0 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.8.0/INSTALL.md) @23.8.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.12.0/README.md) @2.12.0 ## Requirements @@ -79,11 +79,14 @@ sudo dnf install -y git curl 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 | INSTALL_K3S_VERSION=v1.28.5+k3s1 sh -s - --write-kubeconfig-mode 644 +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.6+k3s2 sh -s - --write-kubeconfig-mode 644 ``` ### Install AWX Operator +> [!WARNING] +> AWX Operator 2.12.0 and AWX 23.8.0 are marked as NOT RECOMMENDED due to [a known issue](https://github.com/ansible/awx/issues/14876). Refer to the release notes ([for AWX Operator](https://github.com/ansible/awx-operator/releases/tag/2.12.0), [for AWX](https://github.com/ansible/awx/releases/tag/23.8.0)) for details. + 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). @@ -92,7 +95,7 @@ If you want to use files suitable for the specific version of AWX Operator, [ref cd ~ git clone https://github.com/kurokobo/awx-on-k3s.git cd awx-on-k3s -git checkout 2.11.0 +git checkout 2.12.0 ``` Then invoke `kubectl apply -k operator` to deploy AWX Operator. diff --git a/acme/README.md b/acme/README.md index cc591cf..631f43f 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.3/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.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 3770a30..951692d 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.11.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/2.12.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/operator/kustomization.yaml b/operator/kustomization.yaml index a046f82..d0ac04d 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.11.0 + - github.com/ansible/awx-operator/config/default?ref=2.12.0 images: - name: quay.io/ansible/awx-operator - newTag: 2.11.0 + newTag: 2.12.0 diff --git a/runner/README.md b/runner/README.md index 95adf14..713a3ae 100644 --- a/runner/README.md +++ b/runner/README.md @@ -10,7 +10,7 @@ This repository includes ready-to-use files as an example to run Ansible Runner. - CentOS Stream 8 (Minimal) - Python 3.9 - Docker 20.10.17 -- Ansible Runner 2.3.4 +- Ansible Runner 2.3.5 ## Install diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index 2573bce..569dbf3 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -35,6 +35,9 @@ Refer [📝README: Backing up using AWX Operator](../README.md#backing-up-using- If you are using AWX Operator `0.14.0` or later and want to upgrade to newer version, basically upgrade is done by deploying the new version of AWX Operator to the same namespace where the old AWX Operator is running. +> [!WARNING] +> AWX Operator 2.12.0 and AWX 23.8.0 are marked as NOT RECOMMENDED due to [a known issue](https://github.com/ansible/awx/issues/14876). Refer to the release notes ([for AWX Operator](https://github.com/ansible/awx-operator/releases/tag/2.12.0), [for AWX](https://github.com/ansible/awx/releases/tag/23.8.0)) for details. + ### ⚠️ Note for upgrading from `2.0.0` to `2.0.1` or later Note that only when upgrading **from `2.0.0` that deployed using this repository to `2.0.1` or later**, [the `extra_volumes` and `extra_volumes` in `base/awx.yaml` for `2.0.0` as a workaround for specific issue](https://github.com/kurokobo/awx-on-k3s/blob/2.0.0/base/awx.yaml#L42-L51) causes failure of upgrading. diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 2c7d66d..3d75642 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.12.0 | 23.8.0 | | 2.11.0 | 23.7.0 | | 2.10.0 | 23.6.0 | | 2.9.0 | 23.5.1 |