expand/awx-on-k3s
1
0
Fork 0
mirror of https://github.com/Expand-sys/awx-on-k3s synced 2025-12-16 14:02:15 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: bump awx operator version to 2.19.1 (#382)

Browse source
This commit is contained in:
kurokobo 2024-07-12 23:24:14 +09:00 committed by GitHub
parent 6512092f00
commit 7b05017a38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -29,17 +29,17 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas
- Tested on: - Tested on:
- CentOS Stream 9 (Minimal) - CentOS Stream 9 (Minimal)
- K3s v1.29.5+k3s1 - K3s v1.29.6+k3s2
- Products that will be deployed: - Products that will be deployed:
- AWX Operator 2.19.0 - AWX Operator 2.19.1
- AWX 24.6.0 - AWX 24.6.1
- PostgreSQL 15 - PostgreSQL 15
## 📝 References ## 📝 References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/) - [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 - [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.0/README.md) @2.19.0 - [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.19.1/README.md) @2.19.1
## 📝 Requirements ## 📝 Requirements
@ -82,7 +82,7 @@ Install a specific version of K3s with `--write-kubeconfig-mode 644` to make the
<!-- shell: k3s: install --> <!-- shell: k3s: install -->
```bash ```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 ### ✅ Install AWX Operator
@ -95,7 +95,7 @@ If you want to use files suitable for a specific version of AWX Operator, [refer
cd ~ cd ~
git clone https://github.com/kurokobo/awx-on-k3s.git git clone https://github.com/kurokobo/awx-on-k3s.git
cd awx-on-k3s cd awx-on-k3s
git checkout 2.19.0 git checkout 2.19.1
``` ```
Then invoke `kubectl apply -k operator` to deploy AWX Operator. Then invoke `kubectl apply -k operator` to deploy AWX Operator.
@ -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) ----- ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP ********************************************************************* 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. The required objects should now have been deployed next to AWX Operator in the `awx` namespace.
@ -214,7 +214,7 @@ NAME READY STATUS RESTAR
pod/awx-operator-controller-manager-59b86c6fb-4zz9r 2/2 Running 0 7m22s pod/awx-operator-controller-manager-59b86c6fb-4zz9r 2/2 Running 0 7m22s
pod/awx-postgres-15-0 1/1 Running 0 6m33s pod/awx-postgres-15-0 1/1 Running 0 6m33s
pod/awx-web-549f7fdbc5-htpl9 3/3 Running 0 6m5s 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 pod/awx-task-7d4fcdd449-mqkp2 4/4 Running 0 6m4s
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
@ -236,7 +236,7 @@ NAME READY AGE
statefulset.apps/awx-postgres-15 1/1 6m33s statefulset.apps/awx-postgres-15 1/1 6m33s
NAME COMPLETIONS DURATION AGE 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 NAME CLASS HOSTS ADDRESS PORTS AGE
ingress.networking.k8s.io/awx-ingress traefik awx.example.com 192.168.0.221 80, 443 6m6s ingress.networking.k8s.io/awx-ingress traefik awx.example.com 192.168.0.221 80, 443 6m6s

2
acme/README.md
View file

@ -43,7 +43,7 @@ Deploy cert-manager first.
<!-- shell: instance: deploy cert manager --> <!-- shell: instance: deploy cert manager -->
```bash ```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. Ensure the pods in `cert-manager` namespace are running.

2
argocd/kustomization.yaml
View file

@ -29,5 +29,5 @@ configMapGenerator:
resources: resources:
- namespace.yaml - 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 - ingressroute.yaml

2
backup/ansible/README.md
View file

@ -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_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_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_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` | | `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` |

4
base/awx.yaml
View file

@ -5,8 +5,8 @@ metadata:
name: awx name: awx
spec: spec:
# These parameters are designed for use with: # These parameters are designed for use with:
# - AWX Operator: 2.19.0 # - AWX Operator: 2.19.1
# https://github.com/ansible/awx-operator/blob/2.19.0/README.md # https://github.com/ansible/awx-operator/blob/2.19.1/README.md
admin_user: admin admin_user: admin
admin_password_secret: awx-admin-password admin_password_secret: awx-admin-password

4
operator/kustomization.yaml
View file

@ -12,8 +12,8 @@ secretGenerator:
- operator=awx - operator=awx
resources: resources:
- github.com/ansible/awx-operator/config/default?ref=2.19.0 - github.com/ansible/awx-operator/config/default?ref=2.19.1
images: images:
- name: quay.io/ansible/awx-operator - name: quay.io/ansible/awx-operator
newTag: 2.19.0 newTag: 2.19.1

2
restore/README.md
View file

@ -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) ----- ----- Ansible Task Status Event StdOut (awx.ansible.com/v1beta1, Kind=AWX, awx/awx) -----
PLAY RECAP ********************************************************************* 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. This will create AWXRestore object in the namespace, and now your AWX is restored.

2
tips/expose-hosts.md
View file

@ -51,7 +51,7 @@ Note that any IP addresses in the following steps have to be replaced with your
```bash ```bash
# Change configuration using script: # 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: # If you don't want to use the script, modify /etc/systemd/system/k3s.service manually:
$ cat /etc/systemd/system/k3s.service $ cat /etc/systemd/system/k3s.service

1
tips/version-mapping.md
View file

@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.
| AWX Operator | AWX | | AWX Operator | AWX |
| ------------ | ------- | | ------------ | ------- |
| 2.19.1 | 24.6.1 |
| 2.19.0 | 24.6.0 | | 2.19.0 | 24.6.0 |
| 2.18.0 | 24.5.0 | | 2.18.0 | 24.5.0 |
| 2.17.0 | 24.4.0 | | 2.17.0 | 24.4.0 |