From 4a3a9029d2c658655c15eb1e9bd82e03d3f02a1d Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Sun, 18 Sep 2022 05:38:07 +0900 Subject: [PATCH] feat: bump operator version to 0.29.0 --- README.md | 32 +++++++++++++++++--------------- backup/ansible/README.md | 2 +- base/awx.yaml | 8 ++++---- base/dockerconfig.json | 8 -------- base/kustomization.yaml | 7 ------- restore/README.md | 2 +- tips/troubleshooting.md | 2 +- tips/version-mapping.md | 1 + 8 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 base/dockerconfig.json diff --git a/README.md b/README.md index affd0b5..a5f36e5 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.24.4+k3s1 - Products that will be deployed: - - AWX Operator 0.28.0 - - AWX 21.5.0 + - AWX Operator 0.29.0 + - AWX 21.6.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.5.0/INSTALL.md) @21.5.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.28.0/README.md) @0.28.0 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.6.0/INSTALL.md) @21.6.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.29.0/README.md) @0.29.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.28.0 +git checkout 0.29.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.28.0 +git checkout 0.29.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 -c awx-mana ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* -localhost : ok=71 changed=0 unreachable=0 failed=0 skipped=48 rescued=0 ignored=1 +localhost : ok=74 changed=0 unreachable=0 failed=0 skipped=61 rescued=0 ignored=1 ``` Required objects has been deployed next to AWX Operator in `awx` namespace. @@ -234,14 +234,16 @@ statefulset.apps/awx-postgres-13 1/1 4m46s NAME CLASS HOSTS ADDRESS PORTS AGE ingress.networking.k8s.io/awx-ingress awx.example.com 192.168.0.219,2400:4050:a8e2:a00:250:56ff:fe86:454d 80, 443 4m27s -NAME TYPE DATA AGE -secret/awx-admin-password Opaque 1 5m -secret/awx-postgres-configuration Opaque 6 5m -secret/awx-secret-tls kubernetes.io/tls 2 5m -secret/redhat-operators-pull-secret kubernetes.io/dockerconfigjson 1 5m -secret/awx-app-credentials Opaque 3 4m30s -secret/awx-secret-key Opaque 1 4m55s -secret/awx-broadcast-websocket Opaque 1 4m52s +NAME TYPE DATA AGE +secret/awx-admin-password Opaque 1 5m +secret/awx-postgres-configuration Opaque 6 5m +secret/awx-secret-tls kubernetes.io/tls 2 3m54s +secret/redhat-operators-pull-secret Opaque 1 4m30s +secret/awx-receptor-ca Opaque 2 4m26s +secret/awx-receptor-work-signing Opaque 2 4m29s +secret/awx-app-credentials Opaque 3 4m30s +secret/awx-secret-key Opaque 1 4m55s +secret/awx-broadcast-websocket Opaque 1 4m52s ``` Now your AWX is available at `https://awx.example.com/` or the hostname you specified. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 9b539cd..0aa4bcc 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/0.28.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/0.29.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 b8d6925..6fc1a55 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: 0.28.0 - # https://github.com/ansible/awx-operator/blob/0.28.0/README.md - # - AWX: 21.5.0 - # https://github.com/ansible/awx/blob/21.5.0/INSTALL.md + # - AWX Operator: 0.29.0 + # https://github.com/ansible/awx-operator/blob/0.29.0/README.md + # - AWX: 21.6.0 + # https://github.com/ansible/awx/blob/21.6.0/INSTALL.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/base/dockerconfig.json b/base/dockerconfig.json deleted file mode 100644 index 536cc4f..0000000 --- a/base/dockerconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "auths": { - "dummy.example.com": { - "username": "you_do_not_need_to_edit_this_file", - "password": "this_file_is_used_in_workaround_to_suppress_certain_errors" - } - } -} diff --git a/base/kustomization.yaml b/base/kustomization.yaml index bcbcce0..bddf77e 100644 --- a/base/kustomization.yaml +++ b/base/kustomization.yaml @@ -36,13 +36,6 @@ secretGenerator: # literals: # - secret_key=MySuperSecureSecretKey123! - # Temporary workaround to suppress errors from AWX Operator 0.21.0. - # Refer: https://github.com/kurokobo/awx-on-k3s/issues/74 - - name: redhat-operators-pull-secret - files: - - .dockerconfigjson=dockerconfig.json - type: kubernetes.io/dockerconfigjson - resources: - pv.yaml - pvc.yaml diff --git a/restore/README.md b/restore/README.md index 81802f2..d04bcfc 100644 --- a/restore/README.md +++ b/restore/README.md @@ -100,7 +100,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-mana ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* -localhost : ok=73 changed=0 unreachable=0 failed=0 skipped=46 rescued=0 ignored=1 +localhost : ok=76 changed=0 unreachable=0 failed=0 skipped=59 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 3de6c07..b4ab222 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/0.28.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/0.29.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 f7be1cd..2c6a9cd 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 | | - | - | +| 0.29.0 | 21.6.0 | | 0.28.0 | 21.5.0 | | 0.27.0 | 21.5.0 | | 0.26.0 | 21.4.0 |