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

feat: bump awx operator version to 2.16.1, galaxy operator version to 2024.4.30 (#356)

Browse source
This commit is contained in:
kurokobo 2024-05-01 22:54:59 +09:00 committed by GitHub
parent add8612839
commit d3e9faefaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -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.28.7+k3s1
- K3s v1.29.4+k3s1
- Products that will be deployed:
- AWX Operator 2.16.0
- AWX 24.3.0
- AWX Operator 2.16.1
- AWX 24.3.1
- PostgreSQL 15
## 📝 References
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/24.3.0/INSTALL.md) @24.3.0
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.16.0/README.md) @2.16.0
- [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
## 📝 Requirements
@ -82,14 +82,11 @@ 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.28.7+k3s1 sh -s - --write-kubeconfig-mode 644
curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.4+k3s1 sh -s - --write-kubeconfig-mode 644
```
### ✅ Install AWX Operator
> [!WARNING]
> For AWX Operator 2.16.0, there are some bugs reported. See [the release note](https://github.com/ansible/awx/releases/tag/24.3.0) for further information. If you don't have any specific reason to use 2.16.0, it's recommended to use [2.15.0](https://github.com/kurokobo/awx-on-k3s/tree/2.15.0) instead.
Clone this repository and change directory.
If you want to use files suitable for a specific version of AWX Operator, [refer to tags in this repository](https://github.com/kurokobo/awx-on-k3s/tags) and specify the desired tag in `git checkout`. Especially for `0.13.0` or earlier versions of AWX Operator, refer to [📝Tips: Deploy older version of AWX Operator](tips/deploy-older-operator.md).
@ -98,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.0
git checkout 2.16.1
```
Then invoke `kubectl apply -k operator` to deploy AWX Operator.
@ -217,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.0-kglht 0/1 Completed 0 4m36s
pod/awx-migration-24.3.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
@ -239,7 +236,7 @@ NAME READY AGE
statefulset.apps/awx-postgres-15 1/1 6m33s
NAME COMPLETIONS DURATION AGE
job.batch/awx-migration-24.3.0 1/1 2m4s 4m36s
job.batch/awx-migration-24.3.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

2
acme/README.md
View file

@ -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.14.4/cert-manager.yaml
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.5/cert-manager.yaml
```
Ensure the pods in `cert-manager` namespace are running.

2
argocd/kustomization.yaml
View file

@ -29,5 +29,5 @@ configMapGenerator:
resources:
- namespace.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.7/manifests/install.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.9/manifests/install.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_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.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.16.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` |

4
base/awx.yaml
View file

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

7
galaxy/README.md
View file

@ -34,10 +34,10 @@ In this guide, [Galaxy Operator](https://github.com/ansible/galaxy-operator) is
> [!WARNING]
> Galaxy NG deployed with this procedure will not be used as container registry due to [a known issue](https://github.com/ansible/galaxy-operator/issues/74). If you want to use fully working Galaxy NG, follow [the old version of this guide that uses Pulp Operator instead](https://github.com/kurokobo/awx-on-k3s/tree/2.12.1/galaxy#deploy-on-kubernetes-pulp-operator).
- Galaxy Operator 2024.4.3
- Galaxy Operator 2024.4.30
- Galaxy NG
- Service: 5d56bddb
- UI: 59cf7798
- Service: b7b07e96
- UI: 19fd5a2b
## Deployment Instruction
@ -125,7 +125,6 @@ Prepare directories for Persistent Volumes defined in `galaxy/galaxy/pv.yaml`.
<!-- shell: instance: create directories -->
```bash
sudo mkdir -p /data/galaxy/postgres-13
sudo chmod 755 /data/galaxy/postgres-13
sudo mkdir -p /data/galaxy/file
sudo chown 1000:0 /data/galaxy/file
sudo mkdir -p /data/galaxy/redis

8
galaxy/galaxy/galaxy.yaml
View file

@ -4,13 +4,13 @@ metadata:
name: galaxy
spec:
# These parameters are designed for use with:
# - Galaxy Operator: 2024.4.3
# https://github.com/ansible/galaxy-operator/blob/2024.4.3/README.md
# - Galaxy Operator: 2024.4.30
# https://github.com/ansible/galaxy-operator/blob/2024.4.30/README.md
image: quay.io/ansible/galaxy-ng
image_version: f3c93fc1
image_version: b7b07e96
image_web: quay.io/ansible/galaxy-ui
image_web_version: b2fa0d0d
image_web_version: 19fd5a2b
admin_password_secret: galaxy-admin-password

4
galaxy/operator/kustomization.yaml
View file

@ -12,8 +12,8 @@ secretGenerator:
- operator=eda
resources:
- github.com/ansible/galaxy-operator/config/default?ref=2024.4.3
- github.com/ansible/galaxy-operator/config/default?ref=2024.4.30
images:
- name: quay.io/ansible/galaxy-operator
newTag: 2024.4.3
newTag: 2024.4.30

4
operator/kustomization.yaml
View file

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

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
# Change configuration using script:
$ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.7+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.4+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

3
tips/upgrade-operator.md
View file

@ -11,9 +11,6 @@ Note that once you upgrade AWX Operator, your AWX will also be upgraded automati
[There is `image_version` parameter for AWX resource to change which image will be used](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html), but it appears that using a version of AWX other than the one bundled with the AWX Operator [is currently not supported](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html). Conversely, if you want to upgrade AWX, you need to plan to upgrade AWX Operator first.
> [!WARNING]
> For AWX Operator 2.16.0, there are some bugs reported. See [the release note](https://github.com/ansible/awx/releases/tag/24.3.0) for further information. If you don't have any specific reason to use 2.16.0, it's recommended to use [2.15.0](https://github.com/kurokobo/awx-on-k3s/tree/2.15.0) instead.
<!-- omit in toc -->
## Table of Contents

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.16.1 | 24.3.1 |
| 2.16.0 | 24.3.0 |
| 2.15.0 | 24.2.0 |
| 2.14.0 | 24.1.0 |