Merge pull request #272 from kurokobo/2.7.1

feat: bump operator version to 2.7.1

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.27.6+k3s1
 - Products that will be deployed:
-  - AWX Operator 2.7.0
-  - AWX 23.3.0
+  - AWX Operator 2.7.1
+  - AWX 23.3.1
   - PostgreSQL 13
 
 ## References
 
 - [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
-- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.3.0/INSTALL.md) @23.3.0
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.7.0/README.md) @2.7.0
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.3.1/INSTALL.md) @23.3.1
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.7.1/README.md) @2.7.1
 
 ## Requirements
 
@@ -88,15 +88,15 @@ 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).
 
-**⚠️Note for 2.7.0⚠️**
+**⚠️Note for 2.7.0 and 2.7.1⚠️**
 
-**AWX Operator 2.7.0 has a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use 2.7.0.**
+**AWX Operator 2.7.0 and 2.7.1 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.**
 
 ```bash
 cd ~
 git clone https://github.com/kurokobo/awx-on-k3s.git
 cd awx-on-k3s
-git checkout 2.7.0
+git checkout 2.7.1
 ```
 
 Then invoke `kubectl apply -k operator` to deploy AWX Operator.

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.7.0/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`clean_backup_on_delete: true` |
+| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.7.1/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`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` |
 

galaxy/README.md

@@ -189,7 +189,7 @@ There is a Kubernetes Operator for Pulp 3 named Pulp Operator.
 
 - [pulp/pulp-operator: Kubernetes Operator for Pulp 3](https://github.com/pulp/pulp-operator)
 
-This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-beta.1](https://github.com/pulp/pulp-operator/tree/1.0.0-beta.1).
+This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-beta.2](https://github.com/pulp/pulp-operator/tree/1.0.0-beta.2).
 
 ### Install Pulp Operator
 
@@ -199,7 +199,7 @@ Install specified version of Pulp Operator.
 cd ~
 git clone https://github.com/pulp/pulp-operator.git
 cd pulp-operator
-git checkout 1.0.0-beta.1
+git checkout 1.0.0-beta.2
 ```
 
 Export the name of the namespace where you want to deploy Pulp Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `pulp-operator-system`. Note that `make deploy` requires `go` binary by default but you can remove this dependency by small `sed` patch.

galaxy/pulp/galaxy.yaml

@@ -4,17 +4,17 @@ metadata:
   name: galaxy
 spec:
   # These parameters are designed for use with:
-  # - Pulp Operator: 1.0.0-beta.1
-  #   https://github.com/pulp/pulp-operator/blob/1.0.0-beta.1/README.md
-  # - Galaxy NG: 4.8.0
-  #   https://github.com/ansible/galaxy_ng/tree/4.8.0
+  # - Pulp Operator: 1.0.0-beta.2
+  #   https://github.com/pulp/pulp-operator/blob/1.0.0-beta.2/README.md
+  # - Galaxy NG: 4.8.1
+  #   https://github.com/ansible/galaxy_ng/tree/4.8.1
 
   deployment_type: galaxy
 
   image: quay.io/pulp/galaxy
-  image_version: 4.8.0
+  image_version: 4.8.1
   image_web: quay.io/pulp/galaxy-web
-  image_web_version: 4.8.0
+  image_web_version: 4.8.1
 
   admin_password_secret: galaxy-admin-password
 

operator/kustomization.yaml

@@ -12,8 +12,8 @@ secretGenerator:
       - operator=awx
 
 resources:
-  - github.com/ansible/awx-operator/config/default?ref=2.7.0
+  - github.com/ansible/awx-operator/config/default?ref=2.7.1
 
 images:
   - name: quay.io/ansible/awx-operator
-    newTag: 2.7.0
+    newTag: 2.7.1

restore/README.md

@@ -73,7 +73,7 @@ If you want to restore from AWXBackup object, specify its name in `restore/awxre
 ...
 ```
 
-If the AWXBackup object no longer exists, place the backup files under `/data/backup/<backup directory>` (e.g. `/data/backup/tower-openshift-backup-2021-06-06-10:51:49`) and specify the name of the PVC and directory in `restore/awxrestore.yaml`. **⚠️This method does not work on AWX Operator 2.7.0 due to [#1586](https://github.com/ansible/awx-operator/issues/1586).**
+If the AWXBackup object no longer exists, place the backup files under `/data/backup/<backup directory>` (e.g. `/data/backup/tower-openshift-backup-2021-06-06-10:51:49`) and specify the name of the PVC and directory in `restore/awxrestore.yaml`. **⚠️This method does not work on AWX Operator 2.7.0 and 2.7.1 due to [#1586](https://github.com/ansible/awx-operator/issues/1586).**
 
 ```yaml
 ...

tips/upgrade-operator.md

@@ -11,9 +11,9 @@ Note that once you upgrade AWX Operator, your AWX will also be upgraded automati
 
 [There is `image_version` parameter for AWX resource to change which image will be used](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html), but it appears that using a version of AWX other than the one bundled with the AWX Operator [is currently not supported](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html). Conversely, if you want to upgrade AWX, you need to plan to upgrade AWX Operator first.
 
-**⚠️Note for 2.7.0⚠️**
+**⚠️Note for 2.7.0 and 2.7.1⚠️**
 
-**AWX Operator 2.7.0 has a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use 2.7.0.**
+**AWX Operator 2.7.0 and 2.7.1 have a bug that restoration using backup files directly instead of using AWXBackup object will fail ([#1586](https://github.com/ansible/awx-operator/issues/1586)). If you want to use this method to restore your AWX, you should avoid to use these versions.**
 
 <!-- omit in toc -->
 ## Table of Contents

tips/version-mapping.md

@@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.
 
 | AWX Operator | AWX |
 | - | - |
+| 2.7.1 | 23.3.1 |
 | 2.7.0 | 23.3.0 |
 | 2.6.0 | 23.2.0 |
 | 2.5.3 | 23.1.0 |