From e805601d24302430ccf08f7fc3119a01214a0184 Mon Sep 17 00:00:00 2001
From: kurokobo <2920259+kurokobo@users.noreply.github.com>
Date: Tue, 11 Jul 2023 21:23:55 +0900
Subject: [PATCH] feat: bump operator version to 2.4.0
---
README.md | 12 ++++++------
backup/ansible/README.md | 2 +-
operator/kustomization.yaml | 4 ++--
tips/alternative-methods.md | 11 ++++++-----
tips/troubleshooting.md | 2 +-
tips/version-mapping.md | 1 +
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 89420d1..865eee5 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.26.5+k3s1
+ - K3s v1.27.3+k3s1
- Products that will be deployed:
- - AWX Operator 2.3.0
- - AWX 22.4.0
+ - AWX Operator 2.4.0
+ - AWX 22.5.0
- PostgreSQL 13
## References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
-- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/22.4.0/INSTALL.md) @22.4.0
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.3.0/README.md) @2.3.0
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/22.5.0/INSTALL.md) @22.5.0
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.4.0/README.md) @2.4.0
## Requirements
@@ -92,7 +92,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.3.0
+git checkout 2.4.0
```
Then invoke `kubectl apply -k operator` to deploy AWX Operator.
diff --git a/backup/ansible/README.md b/backup/ansible/README.md
index 3277af3..df9c552 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.3.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.4.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 23d3d36..22f65f3 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.3.0
+ - github.com/ansible/awx-operator/config/default?ref=2.4.0
images:
- name: quay.io/ansible/awx-operator
- newTag: 2.3.0
+ newTag: 2.4.0
diff --git a/tips/alternative-methods.md b/tips/alternative-methods.md
index 23783e8..6c4742c 100644
--- a/tips/alternative-methods.md
+++ b/tips/alternative-methods.md
@@ -256,7 +256,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.22.0"
+OLM_RELEASE="v0.25.0"
curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/install.sh | bash -s ${OLM_RELEASE}
```
@@ -274,16 +274,17 @@ NAMESPACE NAME AGE
operators operatorgroup.operators.coreos.com/global-operators 83s
olm operatorgroup.operators.coreos.com/olm-operators 83s
-NAMESPACE NAME DISPLAY VERSION REPLACES PHASE
-olm clusterserviceversion.operators.coreos.com/packageserver Package Server 0.22.0 Succeeded
-
NAMESPACE NAME DISPLAY TYPE PUBLISHER AGE
olm catalogsource.operators.coreos.com/operatorhubio-catalog Community Operators grpc OperatorHub.io 83s
+NAMESPACE NAME DISPLAY VERSION REPLACES PHASE
+olm clusterserviceversion.operators.coreos.com/packageserver Package Server 0.25.0 Succeeded
+
+
$ kubectl -n olm get all
NAME READY STATUS RESTARTS AGE
-pod/catalog-operator-5bb75dd968-mkrc6 1/1 Running 0 100s
pod/olm-operator-f56666c56-ggqp2 1/1 Running 0 100s
+pod/catalog-operator-5bb75dd968-mkrc6 1/1 Running 0 100s
pod/packageserver-5d9568694-6lxwg 1/1 Running 0 93s
pod/packageserver-5d9568694-7qnlk 1/1 Running 0 93s
pod/operatorhubio-catalog-hxvcx 1/1 Running 0 93s
diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md
index f2085d0..b05e462 100644
--- a/tips/troubleshooting.md
+++ b/tips/troubleshooting.md
@@ -186,7 +186,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/2.3.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/2.4.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 265dd65..2cd877b 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.4.0 | 22.5.0 |
| 2.3.0 | 22.4.0 |
| 2.2.1 | 22.3.0 |
| 2.2.0 | 22.3.0 |