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

feat: bump operator version to 2.9.0

Browse source
This commit is contained in:
kurokobo 2023-12-13 23:29:40 +09:00
parent 0b19c41190
commit e5587f5f68
10 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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 8 (Minimal) - CentOS Stream 8 (Minimal)
- K3s v1.27.7+k3s2 - K3s v1.28.4+k3s2
- Products that will be deployed: - Products that will be deployed:
- AWX Operator 2.8.0 - AWX Operator 2.9.0
- AWX 23.5.0 - AWX 23.5.1
- PostgreSQL 13 - PostgreSQL 13
## 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/23.5.0/INSTALL.md) @23.5.0 - [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.5.1/INSTALL.md) @23.5.1
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.8.0/README.md) @2.8.0 - [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.9.0/README.md) @2.9.0
## Requirements ## Requirements
@ -79,7 +79,7 @@ sudo dnf install -y git curl
Install specific version of K3s with `--write-kubeconfig-mode 644` to make config file (`/etc/rancher/k3s/k3s.yaml`) readable by non-root user. Install specific version of K3s with `--write-kubeconfig-mode 644` to make config file (`/etc/rancher/k3s/k3s.yaml`) readable by non-root user.
```bash ```bash
curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.27.7+k3s2 sh -s - --write-kubeconfig-mode 644 curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.4+k3s2 sh -s - --write-kubeconfig-mode 644
``` ```
### Install AWX Operator ### Install AWX Operator
@ -92,7 +92,7 @@ If you want to use files suitable for the specific version of AWX Operator, [ref
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.8.0 git checkout 2.9.0
``` ```
Then invoke `kubectl apply -k operator` to deploy AWX Operator. Then invoke `kubectl apply -k operator` to deploy AWX Operator.
@ -190,7 +190,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=83 changed=0 unreachable=0 failed=0 skipped=79 rescued=0 ignored=1 localhost : ok=84 changed=0 unreachable=0 failed=0 skipped=79 rescued=0 ignored=1
``` ```
Required objects has been deployed next to AWX Operator in `awx` namespace. Required objects has been deployed next to AWX Operator in `awx` namespace.

2
acme/README.md
View file

@ -42,7 +42,7 @@ This guide does not provide any information how to configure Azure, other DNS se
Deploy cert-manager first. Deploy cert-manager first.
```bash ```bash
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.3/cert-manager.yaml
``` ```
Ensure the pods in `cert-manager` namespace are running. Ensure the pods in `cert-manager` namespace are running.

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.8.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.9.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_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` |

28
galaxy/README.md
View file

@ -189,7 +189,7 @@ There is a Kubernetes Operator for Pulp 3 named Pulp Operator.
- [pulp/pulp-operator: Kubernetes Operator for Pulp 3](https://github.com/pulp/pulp-operator) - [pulp/pulp-operator: Kubernetes Operator for Pulp 3](https://github.com/pulp/pulp-operator)
This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-beta.2](https://github.com/pulp/pulp-operator/tree/1.0.0-beta.2). This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-beta.3](https://github.com/pulp/pulp-operator/tree/1.0.0-beta.3).
### Install Pulp Operator ### Install Pulp Operator
@ -199,7 +199,7 @@ Install specified version of Pulp Operator.
cd ~ cd ~
git clone https://github.com/pulp/pulp-operator.git git clone https://github.com/pulp/pulp-operator.git
cd pulp-operator cd pulp-operator
git checkout 1.0.0-beta.2 git checkout 1.0.0-beta.3
``` ```
Export the name of the namespace where you want to deploy Pulp Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `pulp-operator-system`. Note that `make deploy` requires `go` binary by default but you can remove this dependency by small `sed` patch. Export the name of the namespace where you want to deploy Pulp Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `pulp-operator-system`. Note that `make deploy` requires `go` binary by default but you can remove this dependency by small `sed` patch.
@ -313,8 +313,8 @@ When the deployment completes successfully, the logs end with:
```txt ```txt
$ kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager $ kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager
... ...
2006-01-02T15:04:05Z INFO repo_manager/status.go:149 galaxy operator finished execution ... 2006-01-02T15:04:05Z INFO repo_manager/status.go:148 galaxy finished execution ...
2006-01-02T15:04:05Z INFO repo_manager/controller.go:236 Operator tasks synced 2006-01-02T15:04:05Z INFO repo_manager/controller.go:129 Operator tasks synced
``` ```
Required objects has been deployed next to Pulp Operator in `galaxy` namespace. Required objects has been deployed next to Pulp Operator in `galaxy` namespace.
@ -383,7 +383,7 @@ Now your AWX is available at `https://galaxy.example.com/` or the hostname you s
## Configuration and Usage ## Configuration and Usage
Basic configuration and usage of Galaxy NG. Following section is based on Galxy NG 4.7. Basic configuration and usage of Galaxy NG. Following section is based on Galaxy NG 4.9.
### Sync Collections with Public Galaxy ### Sync Collections with Public Galaxy
@ -394,26 +394,26 @@ Create a list of Collections to be synchronized as YAML file.
collections: collections:
- name: community.general - name: community.general
source: https://galaxy.ansible.com source: https://galaxy.ansible.com
version: ">=3.2.0" version: ">=8.0.0"
- name: community.kubernetes - name: kubernetes.core
source: https://galaxy.ansible.com source: https://galaxy.ansible.com
version: "2.0.0" version: "3.0.0"
- name: community.vmware - name: community.vmware
source: https://galaxy.ansible.com source: https://galaxy.ansible.com
version: ">=1.10.0,<1.12.0" version: ">=3.10.0,<4.0.0"
- name: awx.awx - name: awx.awx
source: https://galaxy.ansible.com source: https://galaxy.ansible.com
version: ">=19.0.0" version: ">=23.0.0"
- name: ansible.utils - name: ansible.utils
source: https://galaxy.ansible.com source: https://galaxy.ansible.com
version: ">=2.1.0" version: ">=2.12.0"
``` ```
In Galaxy NG, open `Collections` > `Remote` > `community` and click `Edit`. In Galaxy NG, open `Collections` > `Remotes` > `community` and click `Edit`.
Select your YAML file in `YAML requirements` and `Save`. Upload your YAML file in `YAML requirements` and `Save`.
Open `Collections` > `Repositories` > `community`, then `Sync` and wait to complete. Open `Collections` > `Repositories` > `community` > `Sync`, then `Sync` and wait to complete.
### Publish Your Own Collections to Galaxy NG ### Publish Your Own Collections to Galaxy NG

12
galaxy/pulp/galaxy.yaml
View file

@ -4,17 +4,17 @@ metadata:
name: galaxy name: galaxy
spec: spec:
# These parameters are designed for use with: # These parameters are designed for use with:
# - Pulp Operator: 1.0.0-beta.2 # - Pulp Operator: 1.0.0-beta.3
# https://github.com/pulp/pulp-operator/blob/1.0.0-beta.2/README.md # https://github.com/pulp/pulp-operator/blob/1.0.0-beta.3/README.md
# - Galaxy NG: 4.8.1 # - Galaxy NG: 4.9.0
# https://github.com/ansible/galaxy_ng/tree/4.8.1 # https://github.com/ansible/galaxy_ng/tree/4.9.0
deployment_type: galaxy deployment_type: galaxy
image: quay.io/pulp/galaxy image: quay.io/pulp/galaxy
image_version: 4.8.1 image_version: 4.9.0
image_web: quay.io/pulp/galaxy-web image_web: quay.io/pulp/galaxy-web
image_web_version: 4.8.1 image_web_version: 4.9.0
admin_password_secret: galaxy-admin-password admin_password_secret: galaxy-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.8.0 - github.com/ansible/awx-operator/config/default?ref=2.9.0
images: images:
- name: quay.io/ansible/awx-operator - name: quay.io/ansible/awx-operator
newTag: 2.8.0 newTag: 2.9.0

2
restore/README.md
View file

@ -102,7 +102,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=85 changed=0 unreachable=0 failed=0 skipped=77 rescued=0 ignored=1 localhost : ok=86 changed=0 unreachable=0 failed=0 skipped=77 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.

4
rulebooks/operator/kustomization.yaml
View file

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

8
rulebooks/server/eda.yaml
View file

@ -15,14 +15,10 @@ spec:
automation_server_ssl_verify: no automation_server_ssl_verify: no
image: quay.io/ansible/eda-server image: quay.io/ansible/eda-server
image_version: sha-70529ad image_version: sha-f0228ed
image_web: quay.io/ansible/eda-ui image_web: quay.io/ansible/eda-ui
image_web_version: 2.4.716 image_web_version: 2.4.739
extra_settings:
- setting: EDA_CSRF_TRUSTED_ORIGINS
value: http://eda-api:8000
api: api:
replicas: 1 replicas: 1

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.9.0 | 23.5.1 |
| 2.8.0 | 23.5.0 | | 2.8.0 | 23.5.0 |
| 2.7.2 | 23.4.0 | | 2.7.2 | 23.4.0 |
| 2.7.1 | 23.3.1 | | 2.7.1 | 23.3.1 |