From 53b4267e30d466298ead4fbee88a6e0750d46687 Mon Sep 17 00:00:00 2001
From: kurokobo <2920259+kurokobo@users.noreply.github.com>
Date: Sun, 4 Dec 2022 03:30:16 +0900
Subject: [PATCH] feat: bump operator version to 1.1.1
---
README.md | 12 ++++++------
backup/ansible/README.md | 2 +-
base/awx.yaml | 8 ++++----
tips/troubleshooting.md | 2 +-
tips/version-mapping.md | 1 +
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 2158315..eca9800 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.25.3+k3s1
- Products that will be deployed:
- - AWX Operator 1.1.0
- - AWX 21.9.0
+ - AWX Operator 1.1.1
+ - AWX 21.10.0
- PostgreSQL 13
## References
- [K3s - Lightweight Kubernetes](https://rancher.com/docs/k3s/latest/en/)
-- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.9.0/INSTALL.md) @21.9.0
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.1.0/README.md) @1.1.0
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.10.0/INSTALL.md) @21.10.0
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.1.1/README.md) @1.1.1
## Requirements
@@ -90,7 +90,7 @@ Install specified version of AWX Operator. Note that this procedure is applicabl
cd ~
git clone https://github.com/ansible/awx-operator.git
cd awx-operator
-git checkout 1.1.0
+git checkout 1.1.1
```
Export the name of the namespace where you want to deploy AWX Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `awx`.
@@ -127,7 +127,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 1.1.0
+git checkout 1.1.1
```
Generate a Self-Signed certificate. Note that IP address can't be specified. If you want to use a certificate from public ACME CA such as Let's Encrypt or ZeroSSL instead of Self-Signed certificate, follow the guide on [📁 **Use SSL Certificate from Public ACME CA**](acme) first and come back to this step when done.
diff --git a/backup/ansible/README.md b/backup/ansible/README.md
index a6634b8..7177b13 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/1.1.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/1.1.1/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/base/awx.yaml b/base/awx.yaml
index 68750b4..b321138 100644
--- a/base/awx.yaml
+++ b/base/awx.yaml
@@ -5,10 +5,10 @@ metadata:
name: awx
spec:
# These parameters are designed for use with:
- # - AWX Operator: 1.1.0
- # https://github.com/ansible/awx-operator/blob/1.1.0/README.md
- # - AWX: 21.9.0
- # https://github.com/ansible/awx/blob/21.9.0/INSTALL.md
+ # - AWX Operator: 1.1.1
+ # https://github.com/ansible/awx-operator/blob/1.1.1/README.md
+ # - AWX: 21.10.0
+ # https://github.com/ansible/awx/blob/21.10.0/INSTALL.md
admin_user: admin
admin_password_secret: awx-admin-password
diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md
index 66d6412..68a828a 100644
--- a/tips/troubleshooting.md
+++ b/tips/troubleshooting.md
@@ -179,7 +179,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/1.1.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/1.1.1/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 05ee3a3..137a243 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 |
| - | - |
+| 1.1.1 | 21.10.0 |
| 1.1.0 | 21.9.0 |
| 1.0.0 | 21.8.0 |
| 0.30.0 | 21.7.0 |