Skip to content

Commit

Permalink
feat: bump awx operator version to 2.19.1 (#382)
Browse files Browse the repository at this point in the history
  • Loading branch information
kurokobo authored Jul 12, 2024
1 parent 6512092 commit 7b05017
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 19 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5+k3s1
- K3s v1.29.6+k3s2
- Products that will be deployed:
- AWX Operator 2.19.0
- AWX 24.6.0
- AWX Operator 2.19.1
- AWX 24.6.1
- PostgreSQL 15

## 📝 References

- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.6.0/INSTALL.md) @24.6.0
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.19.0/README.md) @2.19.0
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.6.1/INSTALL.md) @24.6.1
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.19.1/README.md) @2.19.1

## 📝 Requirements

Expand Down Expand Up @@ -82,7 +82,7 @@ Install a specific version of K3s with `--write-kubeconfig-mode 644` to make the

<!-- shell: k3s: install -->
```bash
curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.5+k3s1 sh -s - --write-kubeconfig-mode 644
curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.6+k3s2 sh -s - --write-kubeconfig-mode 644
```

### ✅ Install AWX Operator
Expand All @@ -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.19.0
git checkout 2.19.1
```

Then invoke `kubectl apply -k operator` to deploy AWX Operator.
Expand Down Expand Up @@ -199,7 +199,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager
...
----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP *********************************************************************
localhost : ok=90 changed=0 unreachable=0 failed=0 skipped=82 rescued=0 ignored=1
localhost : ok=90 changed=0 unreachable=0 failed=0 skipped=83 rescued=0 ignored=1
```

The required objects should now have been deployed next to AWX Operator in the `awx` namespace.
Expand All @@ -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.6.0-kglht 0/1 Completed 0 4m36s
pod/awx-migration-24.6.1-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
Expand All @@ -236,7 +236,7 @@ NAME READY AGE
statefulset.apps/awx-postgres-15 1/1 6m33s

NAME COMPLETIONS DURATION AGE
job.batch/awx-migration-24.6.0 1/1 2m4s 4m36s
job.batch/awx-migration-24.6.1 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
Expand Down
2 changes: 1 addition & 1 deletion acme/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Deploy cert-manager first.

<!-- shell: instance: deploy cert manager -->
```bash
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.0/cert-manager.yaml
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.1/cert-manager.yaml
```

Ensure the pods in `cert-manager` namespace are running.
Expand Down
2 changes: 1 addition & 1 deletion argocd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ configMapGenerator:

resources:
- namespace.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.11.3/manifests/install.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.11.4/manifests/install.yaml
- ingressroute.yaml
2 changes: 1 addition & 1 deletion backup/ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`clean_backup_on_delete: true` |
| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.19.1/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`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` |

Expand Down
4 changes: 2 additions & 2 deletions base/awx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
name: awx
spec:
# These parameters are designed for use with:
# - AWX Operator: 2.19.0
# https://github.com/ansible/awx-operator/blob/2.19.0/README.md
# - AWX Operator: 2.19.1
# https://github.com/ansible/awx-operator/blob/2.19.1/README.md

admin_user: admin
admin_password_secret: awx-admin-password
Expand Down
4 changes: 2 additions & 2 deletions operator/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ secretGenerator:
- operator=awx

resources:
- github.com/ansible/awx-operator/config/default?ref=2.19.0
- github.com/ansible/awx-operator/config/default?ref=2.19.1

images:
- name: quay.io/ansible/awx-operator
newTag: 2.19.0
newTag: 2.19.1
2 changes: 1 addition & 1 deletion restore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ $ kubectl -n awx logs -f deployments/awx-operator-controller-manager
...
----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP *********************************************************************
localhost : ok=92 changed=0 unreachable=0 failed=0 skipped=80 rescued=0 ignored=1
localhost : ok=92 changed=0 unreachable=0 failed=0 skipped=81 rescued=0 ignored=1
```

This will create AWXRestore object in the namespace, and now your AWX is restored.
Expand Down
2 changes: 1 addition & 1 deletion tips/expose-hosts.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5+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.6+k3s2 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
Expand Down
1 change: 1 addition & 0 deletions tips/version-mapping.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.

| AWX Operator | AWX |
| ------------ | ------- |
| 2.19.1 | 24.6.1 |
| 2.19.0 | 24.6.0 |
| 2.18.0 | 24.5.0 |
| 2.17.0 | 24.4.0 |
Expand Down

0 comments on commit 7b05017

Please sign in to comment.