diff --git a/README.md b/README.md index 439f88b..6b611f2 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 9 (Minimal) - - K3s v1.29.4+k3s1 + - K3s v1.29.5+k3s1 - Products that will be deployed: - - AWX Operator 2.17.0 - - AWX 24.4.0 + - AWX Operator 2.18.0 + - AWX 24.5.0 - PostgreSQL 15 ## 📝 References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [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 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.5.0/INSTALL.md) @24.5.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.18.0/README.md) @2.18.0 ## 📝 Requirements @@ -82,7 +82,7 @@ Install a specific version of K3s with `--write-kubeconfig-mode 644` to make the ```bash -curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.4+k3s1 sh -s - --write-kubeconfig-mode 644 +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.5+k3s1 sh -s - --write-kubeconfig-mode 644 ``` ### ✅ Install AWX Operator @@ -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.17.0 +git checkout 2.18.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.4.0-kglht 0/1 Completed 0 4m36s +pod/awx-migration-24.5.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.4.0 1/1 2m4s 4m36s +job.batch/awx-migration-24.5.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/acme/README.md b/acme/README.md index 1f464a1..57347ec 100644 --- a/acme/README.md +++ b/acme/README.md @@ -43,7 +43,7 @@ Deploy cert-manager first. ```bash -kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.5/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.0/cert-manager.yaml ``` Ensure the pods in `cert-manager` namespace are running. diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml index caded1c..ad25bc8 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.11.2/manifests/install.yaml + - https://raw.githubusercontent.com/argoproj/argo-cd/v2.11.3/manifests/install.yaml - ingressroute.yaml diff --git a/backup/ansible/README.md b/backup/ansible/README.md index d21e7b9..f628e6a 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.17.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/2.18.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 5bcb388..9b78362 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.17.0 - # https://github.com/ansible/awx-operator/blob/2.17.0/README.md + # - AWX Operator: 2.18.0 + # https://github.com/ansible/awx-operator/blob/2.18.0/README.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/git/README.md b/git/README.md index 0c29032..fb38a95 100644 --- a/git/README.md +++ b/git/README.md @@ -77,7 +77,7 @@ Note that this sample manifest does not include any databases, so the SQLite3 ha | Configuration | Recommended Value | | -------------- | -------------------------------------------------------- | | Database Type | `SQLite3` | -| Server Domain | `git.example.com` or the hostname you specified | +| Server Domain | `git.example.com` or the hostname you specified | | Gitea Base URL | `https://git.example.com/` or the hostname you specified | ## Configure AWX to use Git Repository with Self-Signed Certificate diff --git a/git/kustomization.yaml b/git/kustomization.yaml index 97c6c48..2dcac87 100644 --- a/git/kustomization.yaml +++ b/git/kustomization.yaml @@ -15,7 +15,7 @@ secretGenerator: images: - name: gitea/gitea - newTag: "1.21" + newTag: "1.22" resources: - namespace.yaml diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index 38e129b..38739f0 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.17.0 + - github.com/ansible/awx-operator/config/default?ref=2.18.0 images: - name: quay.io/ansible/awx-operator - newTag: 2.17.0 + newTag: 2.18.0 diff --git a/tips/expose-hosts.md b/tips/expose-hosts.md index 9f7bcfd..1095cc0 100644 --- a/tips/expose-hosts.md +++ b/tips/expose-hosts.md @@ -51,7 +51,7 @@ Note that any IP addresses in the following steps have to be replaced with your ```bash # Change configuration using script: - $ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.4+k3s1 sh -s - --write-kubeconfig-mode 644 --resolv-conf /etc/rancher/k3s/resolv.conf + $ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.5+k3s1 sh -s - --write-kubeconfig-mode 644 --resolv-conf /etc/rancher/k3s/resolv.conf # If you don't want to use the script, modify /etc/systemd/system/k3s.service manually: $ cat /etc/systemd/system/k3s.service diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 0c0d3c2..072307e 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.18.0 | 24.5.0 | | 2.17.0 | 24.4.0 | | 2.16.1 | 24.3.1 | | 2.16.0 | 24.3.0 |