Merge pull request #142 from kurokobo/operator-1.0.0

feat: bump operator version to 1.0.0

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.24.6+k3s1
+  - K3s v1.25.3+k3s1
 - Products that will be deployed:
-  - AWX Operator 0.30.0
+  - AWX Operator 1.0.0
-  - AWX 21.7.0
+  - AWX 21.8.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.7.0/INSTALL.md) @21.7.0
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.8.0/INSTALL.md) @21.8.0
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.30.0/README.md) @0.30.0
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.0.0/README.md) @1.0.0
 
 ## 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 0.30.0
+git checkout 1.0.0
 ```
 
 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 0.30.0
+git checkout 1.0.0
 ```
 
 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.

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.9.1/cert-manager.yaml
+kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.10.0/cert-manager.yaml
 ```
 
 Ensure the pods in `cert-manager` namespace are running.

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/0.30.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/1.0.0/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` |
 

backup/awxbackup.yaml

@@ -9,4 +9,4 @@ spec:
   backup_pvc: awx-backup-claim
 
   # Uncomment to reveal "censored" logs
-  #no_log: "false"
+  #no_log: false

base/awx.yaml

@@ -5,10 +5,10 @@ metadata:
   name: awx
 spec:
   # These parameters are designed for use with:
-  # - AWX Operator: 0.30.0
+  # - AWX Operator: 1.0.0
-  #   https://github.com/ansible/awx-operator/blob/0.30.0/README.md
+  #   https://github.com/ansible/awx-operator/blob/1.0.0/README.md
-  # - AWX: 21.7.0
+  # - AWX: 21.8.0
-  #   https://github.com/ansible/awx/blob/21.7.0/INSTALL.md
+  #   https://github.com/ansible/awx/blob/21.8.0/INSTALL.md
 
   admin_user: admin
   admin_password_secret: awx-admin-password
@@ -34,4 +34,4 @@ spec:
   ee_resource_requirements: {}
 
   # Uncomment to reveal "censored" logs
-  #no_log: "false"
+  #no_log: false

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 1.1.0
+- Ansible Builder 1.2.0
 
 ### Install Ansible Builder
 
@@ -100,7 +100,7 @@ Below is an example output of this command.
 
 ```bash
 $ ansible-builder build --tag registry.example.com/ansible/ee:2.12-custom --container-runtime docker --verbosity 3
-Ansible Builder is building your execution environment image, "registry.example.com/ansible/ee:2.12-custom".
+Ansible Builder is building your execution environment image. Tags: registry.example.com/ansible/ee:2.12-custom
 File context/_build/requirements.yml will be created.
 File context/_build/requirements.txt will be created.
 File context/_build/bindep.txt will be created.
@@ -109,9 +109,9 @@ Rewriting Containerfile to capture collection requirements
 Running command:
   docker build -f context/Dockerfile -t registry.example.com/ansible/ee:2.12-custom context
 Sending build context to Docker daemon   7.68kB
-Step 1/25 : ARG EE_BASE_IMAGE=quay.io/ansible/ansible-runner:stable-2.12-latest
+Step 1/27 : ARG EE_BASE_IMAGE=quay.io/ansible/ansible-runner:stable-2.12-latest
-Step 2/25 : ARG EE_BUILDER_IMAGE=quay.io/ansible/ansible-builder:latest
+Step 2/27 : ARG EE_BUILDER_IMAGE=quay.io/ansible/ansible-builder:latest
-Step 3/25 : FROM $EE_BASE_IMAGE as galaxy
+Step 3/27 : FROM $EE_BASE_IMAGE as galaxy
 ...
 Removing intermediate container cb1d45eac7ba
  ---> f6c3375db22e

builder/requirements.txt

@@ -1 +1,4 @@
 example-pypi-package
+
+# Recommended workaround to avoid dependency issues: https://github.com/ansible/ansible-runner/issues/1138
+ansible-runner>=2.2.1

builder/requirements.yml

@@ -1,5 +1,5 @@
 ---
 collections:
   - name: community.general
-    version: 3.3.2
+    version: 6.0.0
     source: https://galaxy.ansible.com

restore/awxrestore.yaml

@@ -15,4 +15,4 @@ spec:
   #backup_dir: /backups/tower-openshift-backup-2021-06-06-10:51:49
 
   # Uncomment to reveal "censored" logs
-  #no_log: "false"
+  #no_log: false

runner/README.md

@@ -10,7 +10,7 @@ This repository includes ready-to-use files as an example to run Ansible Runner.
 - CentOS Stream 8 (Minimal)
 - Python 3.9
 - Docker 20.10.17
-- Ansible Runner 2.2.1
+- Ansible Runner 2.3.1
 
 ## Install
 

tips/troubleshooting.md

@@ -117,14 +117,14 @@ fatal: [localhost]: FAILED! => {"censored": "the output has been hidden due to t
 
 AWX Operator 0.23.0 or later supports making this revealed.
 
-To achieve this, you can uncomment `no_log: "false"` manually under `spec` for your `awx.yaml`, `awxbackup.yaml`, or `awxrestore.yaml`, and then re-run your deployment, backup, or restoration.
+To achieve this, you can uncomment `no_log: false` manually under `spec` for your `awx.yaml`, `awxbackup.yaml`, or `awxrestore.yaml`, and then re-run your deployment, backup, or restoration.
 
 ```yaml
 ...
 spec:
   ...
   # Uncomment to reveal "censored" logs
-  no_log: "false"     👈👈👈
+  no_log: false     👈👈👈
   ...
 ```
 
@@ -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/0.30.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.0.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

tips/version-mapping.md

@@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.
 
 | AWX Operator | AWX |
 | - | - |
+| 1.0.0 | 21.8.0 |
 | 0.30.0 | 21.7.0 |
 | 0.29.0 | 21.6.0 |
 | 0.28.0 | 21.5.0 |