diff --git a/README.md b/README.md index 8336bb0..affd0b5 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ 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.27.0 + - AWX Operator 0.28.0 - AWX 21.5.0 - PostgreSQL 13 @@ -39,7 +39,7 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - [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.27.0/README.md) @0.27.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.28.0/README.md) @0.28.0 ## Requirements @@ -86,15 +86,11 @@ curl -sfL https://get.k3s.io | sh -s - --write-kubeconfig-mode 644 Install specified version of AWX Operator. Note that this procedure is applicable only for AWX Operator `0.14.0` or later. If you want to deploy `0.13.0` or earlier version of AWX Operator, refer [πŸ“Tips: Deploy older version of AWX Operator](tips/deploy-older-operator.md). -| ⚠️ Note ⚠️ | -| :- | -| This guide does not recommend 0.27.0 since there is an issue that the deployment for AWX with some `spec` e.g. `*_extra_volume` or `*_extra_env` will be failed ([ansible/awx-operator#1032](https://github.com/ansible/awx-operator/issues/1032)). Use 0.28.0 or later instead. | - ```bash cd ~ git clone https://github.com/ansible/awx-operator.git cd awx-operator -git checkout 0.27.0 +git checkout 0.28.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`. @@ -131,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.27.0 +git checkout 0.28.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. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 11626f3..9b539cd 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.27.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.28.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 89ca299..b8d6925 100644 --- a/base/awx.yaml +++ b/base/awx.yaml @@ -5,8 +5,8 @@ metadata: name: awx spec: # These parameters are designed for use with: - # - AWX Operator: 0.27.0 - # https://github.com/ansible/awx-operator/blob/0.27.0/README.md + # - 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 diff --git a/restore/README.md b/restore/README.md index a36daa5..81802f2 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=0 +localhost : ok=73 changed=0 unreachable=0 failed=0 skipped=46 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 607af69..3de6c07 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.27.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.28.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 a241474..f7be1cd 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.28.0 | 21.5.0 | | 0.27.0 | 21.5.0 | | 0.26.0 | 21.4.0 | | 0.25.0 | 21.3.0 |