diff --git a/README.md b/README.md index 2c9a168..2fe2bed 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,15 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - Tested on: - CentOS 8 (Minimal) - Products that will be deployed: - - AWX Operator 0.14.0 - - AWX 19.4.0 + - AWX Operator 0.15.0 + - AWX 19.5.0 - PostgreSQL 12 ## References - [K3s - Lightweight Kubernetes](https://rancher.com/docs/k3s/latest/en/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/19.4.0/INSTALL.md) @19.4.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.14.0/README.md) @0.14.0 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/19.5.0/INSTALL.md) @19.5.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/0.15.0/README.md) @0.15.0 ## Procedure @@ -75,7 +75,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.14.0 +git checkout 0.15.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`. @@ -184,7 +184,7 @@ kubectl apply -k base Once this completed, the logs of `deployments/awx-operator-controller-manager` end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* @@ -281,7 +281,7 @@ kubectl apply -f backup/awxbackup.yaml Once this completed, the logs of `deployments/awx-operator-controller-manager` end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWXBackup, awxbackup-2021-06-06/awx) ----- PLAY RECAP ********************************************************************* localhost : ok=3 changed=0 unreachable=0 failed=0 skipped=7 rescued=0 ignored=0 @@ -381,7 +381,7 @@ kubectl apply -f restore/awxrestore.yaml Once this completed, the logs of `deployments/awx-operator-controller-manager` end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* localhost : ok=56 changed=0 unreachable=0 failed=0 skipped=35 rescued=0 ignored=0 @@ -430,4 +430,4 @@ kubectl apply -f awx-secret-tls.yaml - [📝Redirect HTTP to HTTPS](tips/https-redirection.md) - [📝Uninstall deployed resouces](tips/uninstall.md) - [📝Deploy older version of AWX Operator](tips/deploy-older-operator.md) - - [📝Upgrade AWX Operator to 0.14.0 or later](tips/upgrade-operator.md) + - [📝Upgrade AWX Operator from 0.13.0 or earlier to 0.14.0 or later](tips/upgrade-operator.md) diff --git a/base/awx.yaml b/base/awx.yaml index bb2fa64..6999888 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.14.0 - # https://github.com/ansible/awx-operator/blob/0.14.0/README.md - # - AWX: 19.4.0 - # https://github.com/ansible/awx/blob/19.4.0/INSTALL.md + # - AWX Operator: 0.15.0 + # https://github.com/ansible/awx-operator/blob/0.15.0/README.md + # - AWX: 19.5.0 + # https://github.com/ansible/awx/blob/19.5.0/INSTALL.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/tips/README.md b/tips/README.md index dd01b0d..0a554d4 100644 --- a/tips/README.md +++ b/tips/README.md @@ -4,4 +4,4 @@ - [📝Redirect HTTP to HTTPS](https-redirection.md) - [📝Uninstall deployed resouces](uninstall.md) - [📝Deploy older version of AWX Operator](deploy-older-operator.md) -- [📝Upgrade AWX Operator to 0.14.0 or later](upgrade-operator.md) +- [📝Upgrade AWX Operator from 0.13.0 or earlier to 0.14.0 or later](upgrade-operator.md) diff --git a/tips/https-redirection.md b/tips/https-redirection.md index 407e05c..65261f1 100644 --- a/tips/https-redirection.md +++ b/tips/https-redirection.md @@ -83,7 +83,7 @@ awx.awx.ansible.com/awx configured 👈👈👈 Once this completed, the logs of `deployments/awx-operator-controller-manager` end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager --tail=100 +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager --tail=100 ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* @@ -115,7 +115,7 @@ kubectl -n awx patch awx awx --type=merge \ Once this completed, the logs of `deployments/awx-operator-controller-manager` end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager --tail=100 +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager --tail=100 ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP ********************************************************************* diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index b1ae6d9..e9a1d15 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -1,5 +1,5 @@ -# Upgrade AWX Operator to 0.14.0 or later +# Upgrade AWX Operator from 0.13.0 or earlier to 0.14.0 or later [As described in the documentation](https://github.com/ansible/awx-operator/blob/0.14.0/README.md#v0140), AWX Operator changed from cluster scope to namespace scope in `0.14.0`. Also, the Operator SDK `1.x` is used. @@ -110,7 +110,7 @@ Once AWX Operator is up and running, it will start rolling out a new version of We can monitor the progress in the logs of `deployments/awx-operator-controller-manager`. Once this completed, the logs end with: ```txt -$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c manager +$ kubectl -n awx logs -f deployments/awx-operator-controller-manager -c awx-manager ... ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) ----- PLAY RECAP *********************************************************************