From 3a744e76efafbf7e7d2471ac5d67c48f6efe92f3 Mon Sep 17 00:00:00 2001
From: kurokobo <2920259+kurokobo@users.noreply.github.com>
Date: Tue, 9 Jan 2024 22:59:52 +0900
Subject: [PATCH] feat: bump operator version to 2.10.0
---
README.md | 14 +++++++-------
backup/ansible/README.md | 2 +-
operator/kustomization.yaml | 4 ++--
tips/version-mapping.md | 1 +
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 7f0f20e..fe1fad7 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.4+k3s2
+ - K3s v1.28.5+k3s1
- Products that will be deployed:
- - AWX Operator 2.9.0
- - AWX 23.5.1
+ - AWX Operator 2.10.0
+ - AWX 23.6.0
- PostgreSQL 13
## References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
-- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.5.1/INSTALL.md) @23.5.1
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.9.0/README.md) @2.9.0
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.6.0/INSTALL.md) @23.6.0
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.10.0/README.md) @2.10.0
## Requirements
@@ -79,7 +79,7 @@ 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.4+k3s2 sh -s - --write-kubeconfig-mode 644
+curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.5+k3s1 sh -s - --write-kubeconfig-mode 644
```
### Install AWX Operator
@@ -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.9.0
+git checkout 2.10.0
```
Then invoke `kubectl apply -k operator` to deploy AWX Operator.
diff --git a/backup/ansible/README.md b/backup/ansible/README.md
index b08422f..da8e889 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.9.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.10.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 927d960..d6477f5 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.9.0
+ - github.com/ansible/awx-operator/config/default?ref=2.10.0
images:
- name: quay.io/ansible/awx-operator
- newTag: 2.9.0
+ newTag: 2.10.0
diff --git a/tips/version-mapping.md b/tips/version-mapping.md
index 0fee293..39ce441 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.10.0 | 23.6.0 |
| 2.9.0 | 23.5.1 |
| 2.8.0 | 23.5.0 |
| 2.7.2 | 23.4.0 |