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

feat: bump awx operator version to 2.19.0 (#376)

Browse source
This commit is contained in:
kurokobo 2024-06-22 23:05:59 +09:00 committed by GitHub
parent 97dd514bc4
commit 6512092f00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -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.5+k3s1
- Products that will be deployed:
- AWX Operator 2.18.0
- AWX 24.5.0
- AWX Operator 2.19.0
- AWX 24.6.0
- PostgreSQL 15
## 📝 References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
- [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
- [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
## 📝 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.18.0
git checkout 2.19.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.5.0-kglht 0/1 Completed 0 4m36s
pod/awx-migration-24.6.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.5.0 1/1 2m4s 4m36s
job.batch/awx-migration-24.6.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

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_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.18.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.0/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` |

4
base/awx.yaml
View file

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

42
builder/README.md
View file

@ -58,7 +58,7 @@ cd awx-on-k3s/builder
- CentOS Stream 9 (Minimal)
- Python 3.11
- Docker 25.0.4
- Ansible Builder 3.0.1
- Ansible Builder 3.1.0
### Install Ansible Builder
@ -117,19 +117,36 @@ File context/_build/scripts/install-from-bindep will be created.
File context/_build/scripts/introspect.py will be created.
File context/_build/scripts/check_galaxy will be created.
File context/_build/scripts/check_ansible will be created.
File context/_build/scripts/pip_install will be created.
File context/_build/scripts/entrypoint will be created.
Ansible Builder is building your execution environment image. Tags: registry.example.com/ansible/ee:2.15-custom
Running command:
docker build -f context/Dockerfile -t registry.example.com/ansible/ee:2.15-custom context
Sending build context to Docker daemon 50.18kB
Step 1/77 : ARG EE_BASE_IMAGE="quay.io/centos/centos:stream9-minimal"
#0 building with "default" instance using docker driver
#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 3.14kB done
#1 DONE 0.1s
...
Step 77/77 : CMD ["bash"]
---> Running in 2eff2dca84d2
Removing intermediate container 2eff2dca84d2
---> d804667597e9
Successfully built d804667597e9
Successfully tagged registry.example.com/ansible/ee:2.15-custom
#5 [base 1/7] FROM quay.io/centos/centos:stream9-minimal@sha256:08da5b444b6f7bdc1e4253e36fd3bd52d712d9c19c1b9e426fd733c5865c9d30
...
#12 [galaxy 1/7] ADD _build/configs/ansible.cfg ~/.ansible.cfg
...
#13 [builder 1/7] WORKDIR /build
...
#18 [final 1/9] RUN /output/scripts/check_ansible /usr/bin/python3.11
...
#35 exporting to image
#35 exporting layers
#35 exporting layers 1.1s done
#35 writing image sha256:34147e320cd92bf40c545c785e7718dc65936d1b68179f0620b329a286095064 done
#35 naming to registry.example.com/ansible/ee:2.15-custom done
#35 DONE 1.1s
Complete! The build context can be found at: /home/********/awx-on-k3s/builder/context
```
@ -139,7 +156,7 @@ Once the command is complete, your custom EE image is built and stored on Docker
```bash
$ docker image ls
REPOSITORY TAG IMAGE ID CREATED SIZE
registry.example.com/ansible/ee 2.15-custom d804667597e9 20 seconds ago 284MB
registry.example.com/ansible/ee 2.15-custom 34147e320cd9 20 seconds ago 285MB
```
## Use EE
@ -158,7 +175,7 @@ Simply you can push your EE image to some container registry. Any registry can b
$ docker push registry.example.com/ansible/ee:2.15-custom
The push refers to repository [registry.example.com/ansible/ee]
...
2.15-custom: digest: sha256:193b380672c64768231973c58a154fb8eec0f0aae1891e63aea3918308a06716 size: 3456
2.15-custom: digest: sha256:b0d4638a788a74d893075f5600a00e5aef51ada67e46bde2071615fc936ef0d8 size: 3661
```
Then you can specify `registry.example.com/ansible/ee:2.15-custom` as your own custom EE in AWX. Specify registry credentials if your container registry requires authentication.
@ -185,7 +202,7 @@ Ensure your imported image is listed.
$ sudo $(which k3s) crictl images
IMAGE TAG IMAGE ID SIZE
...
registry.example.com/ansible/ee 2.15-custom d804667597e9e 96.3MB
registry.example.com/ansible/ee 2.15-custom 34147e320cd92 295MB
...
```
@ -242,6 +259,7 @@ File context/_build/scripts/install-from-bindep will be created.
File context/_build/scripts/introspect.py will be created.
File context/_build/scripts/check_galaxy will be created.
File context/_build/scripts/check_ansible will be created.
File context/_build/scripts/pip_install will be created.
File context/_build/scripts/entrypoint will be created.
Complete! The build context can be found at: /home/********/awx-on-k3s/builder/context
```

4
operator/kustomization.yaml
View file

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

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 |
| ------------ | ------- |
| 2.19.0 | 24.6.0 |
| 2.18.0 | 24.5.0 |
| 2.17.0 | 24.4.0 |
| 2.16.1 | 24.3.1 |