diff --git a/README.md b/README.md index bf0453e..439f88b 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 9 (Minimal) - K3s v1.29.4+k3s1 - Products that will be deployed: - - AWX Operator 2.16.1 - - AWX 24.3.1 + - AWX Operator 2.17.0 + - AWX 24.4.0 - PostgreSQL 15 ## 📝 References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.3.1/INSTALL.md) @24.3.1 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.16.1/README.md) @2.16.1 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.4.0/INSTALL.md) @24.4.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.17.0/README.md) @2.17.0 ## 📝 Requirements @@ -95,7 +95,7 @@ If you want to use files suitable for a specific version of AWX Operator, [refer cd ~ git clone https://github.com/kurokobo/awx-on-k3s.git cd awx-on-k3s -git checkout 2.16.1 +git checkout 2.17.0 ``` Then invoke `kubectl apply -k operator` to deploy AWX Operator. @@ -214,7 +214,7 @@ NAME READY STATUS RESTAR pod/awx-operator-controller-manager-59b86c6fb-4zz9r 2/2 Running 0 7m22s pod/awx-postgres-15-0 1/1 Running 0 6m33s pod/awx-web-549f7fdbc5-htpl9 3/3 Running 0 6m5s -pod/awx-migration-24.3.1-kglht 0/1 Completed 0 4m36s +pod/awx-migration-24.4.0-kglht 0/1 Completed 0 4m36s pod/awx-task-7d4fcdd449-mqkp2 4/4 Running 0 6m4s NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE @@ -236,7 +236,7 @@ NAME READY AGE statefulset.apps/awx-postgres-15 1/1 6m33s NAME COMPLETIONS DURATION AGE -job.batch/awx-migration-24.3.1 1/1 2m4s 4m36s +job.batch/awx-migration-24.4.0 1/1 2m4s 4m36s NAME CLASS HOSTS ADDRESS PORTS AGE ingress.networking.k8s.io/awx-ingress traefik awx.example.com 192.168.0.221 80, 443 6m6s diff --git a/argocd/README.md b/argocd/README.md index 58bfe85..2a8f4a7 100644 --- a/argocd/README.md +++ b/argocd/README.md @@ -95,7 +95,6 @@ NAME READY AGE statefulset.apps/argocd-application-controller 1/1 31s NAME AGE -appproject.argoproj.io/awx 29s appproject.argoproj.io/default 28s ``` diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml index b71c157..caded1c 100644 --- a/argocd/kustomization.yaml +++ b/argocd/kustomization.yaml @@ -29,5 +29,5 @@ configMapGenerator: resources: - namespace.yaml - - https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.9/manifests/install.yaml + - https://raw.githubusercontent.com/argoproj/argo-cd/v2.11.2/manifests/install.yaml - ingressroute.yaml diff --git a/backup/ansible/README.md b/backup/ansible/README.md index b92fb5d..d21e7b9 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/2.16.1/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/2.17.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 c7b3271..5bcb388 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: 2.16.1 - # https://github.com/ansible/awx-operator/blob/2.16.1/README.md + # - AWX Operator: 2.17.0 + # https://github.com/ansible/awx-operator/blob/2.17.0/README.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index a7854f2..38e129b 100644 --- a/operator/kustomization.yaml +++ b/operator/kustomization.yaml @@ -12,8 +12,8 @@ secretGenerator: - operator=awx resources: - - github.com/ansible/awx-operator/config/default?ref=2.16.1 + - github.com/ansible/awx-operator/config/default?ref=2.17.0 images: - name: quay.io/ansible/awx-operator - newTag: 2.16.1 + newTag: 2.17.0 diff --git a/runner/README.md b/runner/README.md index 0dc6f71..0cc4160 100644 --- a/runner/README.md +++ b/runner/README.md @@ -10,7 +10,7 @@ This repository includes ready-to-use files as an example to run Ansible Runner. - CentOS Stream 9 (Minimal) - Python 3.11 - Docker 25.0.4 -- Ansible Runner 2.3.6 +- Ansible Runner 2.4.0 ## Install diff --git a/tips/alternative-methods.md b/tips/alternative-methods.md index e43a221..069817f 100644 --- a/tips/alternative-methods.md +++ b/tips/alternative-methods.md @@ -270,7 +270,7 @@ In this method, the lifecycle of AWX Operator is managed by OLM. In the default Refer to [the first step of the instruction that appears by `Install` button](https://operatorhub.io/operator/awx-operator) for details. ```bash -OLM_RELEASE="v0.27.0" +OLM_RELEASE="v0.28.0" curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/install.sh | bash -s ${OLM_RELEASE} ``` @@ -448,7 +448,7 @@ kubectl delete -f subscription.yaml To uninstall OLM, some resources should be deleted. ```bash -OLM_RELEASE="v0.27.0" +OLM_RELEASE="v0.28.0" kubectl delete apiservices.apiregistration.k8s.io v1.packages.operators.coreos.com kubectl delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/crds.yaml kubectl delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_RELEASE}/olm.yaml diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 879aa48..0c0d3c2 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 | | ------------ | ------- | +| 2.17.0 | 24.4.0 | | 2.16.1 | 24.3.1 | | 2.16.0 | 24.3.0 | | 2.15.0 | 24.2.0 |