From 73c628ee3e081056e4bb470a7c39c2c8aee030aa Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:57:37 +0900 Subject: [PATCH 1/2] feat: bump operator version to 2.12.2 --- README.md | 13 ++++++++----- acme/README.md | 2 +- backup/README.md | 3 +++ backup/ansible/README.md | 2 +- builder/README.md | 2 +- operator/kustomization.yaml | 4 ++-- tips/alternative-methods.md | 4 ++-- tips/version-mapping.md | 1 + 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9fc46db..3873e08 100644 --- a/README.md +++ b/README.md @@ -31,15 +31,15 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - CentOS Stream 8 (Minimal) - K3s v1.28.6+k3s2 - Products that will be deployed: - - AWX Operator 2.12.1 - - AWX 23.8.1 + - AWX Operator 2.12.2 + - AWX 23.9.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.8.1/INSTALL.md) @23.8.1 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.12.1/README.md) @2.12.1 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.9.0/INSTALL.md) @23.9.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.12.2/README.md) @2.12.2 ## Requirements @@ -85,6 +85,9 @@ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.6+k3s2 sh -s - --write- ### Install AWX Operator +> [!WARNING] +> If you are planning that creating backup of your AWX instance using AWX Operator by referring [the backup guide](backup), AWX Operator 2.12.2 is not recommended due to [a known issue for backup](https://github.com/ansible/awx-operator/issues/1734). + 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). @@ -93,7 +96,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.12.1 +git checkout 2.12.2 ``` Then invoke `kubectl apply -k operator` to deploy AWX Operator. diff --git a/acme/README.md b/acme/README.md index 631f43f..e7d5065 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.14.2/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.3/cert-manager.yaml ``` Ensure the pods in `cert-manager` namespace are running. diff --git a/backup/README.md b/backup/README.md index 682251c..2d52679 100644 --- a/backup/README.md +++ b/backup/README.md @@ -7,6 +7,9 @@ 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. +> [!WARNING] +> AWX Operator 2.12.2 can not create any backup due to [a known issue](https://github.com/ansible/awx-operator/issues/1734). + ## Table of Contents diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 9356a32..5e82c94 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.12.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.12.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/builder/README.md b/builder/README.md index f6888f2..f30fec3 100644 --- a/builder/README.md +++ b/builder/README.md @@ -58,7 +58,7 @@ cd awx-on-k3s/builder - CentOS Stream 8 (Minimal) - Python 3.9 - Docker 20.10.17 -- Ansible Builder 3.0.0 +- Ansible Builder 3.0.1 ### Install Ansible Builder diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index 3784b2f..5552cb7 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.12.1 + - github.com/ansible/awx-operator/config/default?ref=2.12.2 images: - name: quay.io/ansible/awx-operator - newTag: 2.12.1 + newTag: 2.12.2 diff --git a/tips/alternative-methods.md b/tips/alternative-methods.md index 624392d..789c3df 100644 --- a/tips/alternative-methods.md +++ b/tips/alternative-methods.md @@ -271,7 +271,7 @@ In this method, the lifecycle of AWX Operator is managed by OLM. In the default Refer to [the first step of the instruction that appears by `Install` button](https://operatorhub.io/operator/awx-operator) for details. ```bash -OLM_RELEASE="v0.26.0" +OLM_RELEASE="v0.27.0" curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/install.sh | bash -s ${OLM_RELEASE} ``` @@ -449,7 +449,7 @@ kubectl delete -f subscription.yaml To uninstall OLM, some resources should be deleted. ```bash -OLM_RELEASE="v0.26.0" +OLM_RELEASE="v0.27.0" kubectl delete apiservices.apiregistration.k8s.io v1.packages.operators.coreos.com kubectl delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/crds.yaml kubectl delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/olm.yaml diff --git a/tips/version-mapping.md b/tips/version-mapping.md index a7719b5..83ff0ec 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.2 | 23.9.0 | | 2.12.1 | 23.8.1 | | 2.12.0 | 23.8.0 | | 2.11.0 | 23.7.0 | From ea1391b18aabd32c14c5c94bc3d14777915683b6 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:59:29 +0900 Subject: [PATCH 2/2] docs: add link to the older version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3873e08..5dd6e2d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.6+k3s2 sh -s - --write- ### Install AWX Operator > [!WARNING] -> If you are planning that creating backup of your AWX instance using AWX Operator by referring [the backup guide](backup), AWX Operator 2.12.2 is not recommended due to [a known issue for backup](https://github.com/ansible/awx-operator/issues/1734). +> If you are planning that creating backup of your AWX instance using AWX Operator by referring [the backup guide](backup), AWX Operator 2.12.2 is not recommended due to [a known issue for backup](https://github.com/ansible/awx-operator/issues/1734). Use the older version of AWX Operator like [2.12.1](https://github.com/kurokobo/awx-on-k3s/tree/2.12.1) instead. Clone this repository and change directory.