diff --git a/README.md b/README.md
index 4b63286..85d4b65 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.25.5+k3s2
+ - K3s v1.25.6+k3s1
- Products that will be deployed:
- - AWX Operator 1.1.4
- - AWX 21.11.0
+ - AWX Operator 1.2.0
+ - AWX 21.12.0
- PostgreSQL 13
## References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
-- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.11.0/INSTALL.md) @21.11.0
-- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.1.4/README.md) @1.1.4
+- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.12.0/INSTALL.md) @21.12.0
+- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.2.0/README.md) @1.2.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 1.1.4
+git checkout 1.2.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 1.1.4
+git checkout 1.2.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.
@@ -200,7 +200,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager
...
----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP *********************************************************************
-localhost : ok=77 changed=0 unreachable=0 failed=0 skipped=69 rescued=0 ignored=1
+localhost : ok=77 changed=0 unreachable=0 failed=0 skipped=71 rescued=0 ignored=1
```
Required objects has been deployed next to AWX Operator in `awx` namespace.
diff --git a/backup/README.md b/backup/README.md
index 1ecd5bf..9f0afa6 100644
--- a/backup/README.md
+++ b/backup/README.md
@@ -63,7 +63,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager
...
----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWXBackup, awxbackup-2021-06-06/awx) -----
PLAY RECAP *********************************************************************
-localhost : ok=4 changed=0 unreachable=0 failed=0 skipped=8 rescued=0 ignored=0
+localhost : ok=7 changed=0 unreachable=0 failed=0 skipped=9 rescued=0 ignored=0
```
This will create AWXBackup object in the namespace and also create backup files in the Persistent Volume. In this example those files are available at `/data/backup`.
@@ -81,9 +81,9 @@ drwxr-xr-x. 2 root root 59 Jun 5 06:51 tower-openshift-backup-2021-06-06-10:51:
$ ls -l /data/backup/tower-openshift-backup-2021-06-06-10\:51\:49/
total 736
--rw-r--r--. 1 root 749 Jun 6 06:51 awx_object
--rw-r--r--. 1 root 482 Jun 6 06:51 secrets.yml
--rw-rw----. 1 root root 745302 Jun 6 06:51 tower.db
+-rw-------. 1 1001 root 1093 Jun 6 06:51 awx_object
+-rw-------. 1 1001 root 17085 Jun 6 06:51 secrets.yml
+-rw-rw----. 1 root root 833184 Jun 6 06:51 tower.db
```
## Appendix: Back up AWX using Ansible
diff --git a/backup/ansible/README.md b/backup/ansible/README.md
index a0c3e45..56bffff 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.4/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.2.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/base/awx.yaml b/base/awx.yaml
index c1da752..253c6f7 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.4
- # https://github.com/ansible/awx-operator/blob/1.1.4/README.md
- # - AWX: 21.11.0
- # https://github.com/ansible/awx/blob/21.11.0/INSTALL.md
+ # - AWX Operator: 1.2.0
+ # https://github.com/ansible/awx-operator/blob/1.2.0/README.md
+ # - AWX: 21.12.0
+ # https://github.com/ansible/awx/blob/21.12.0/INSTALL.md
admin_user: admin
admin_password_secret: awx-admin-password
diff --git a/restore/README.md b/restore/README.md
index 5b7dc44..c5addf8 100644
--- a/restore/README.md
+++ b/restore/README.md
@@ -100,7 +100,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager
...
----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP *********************************************************************
-localhost : ok=79 changed=0 unreachable=0 failed=0 skipped=67 rescued=0 ignored=1
+localhost : ok=79 changed=0 unreachable=0 failed=0 skipped=69 rescued=0 ignored=1
```
This will create AWXRestore object in the namespace, and now your AWX is restored.
diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md
index 8c50050..15427e3 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.4/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.2.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 0cc45d8..1a67867 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.2.0 | 21.12.0 |
| 1.1.4 | 21.11.0 |
| 1.1.3 | 21.10.2 |
| 1.1.2 | 21.10.1 |