From e5587f5f68031435ec011a03de384953c23861b8 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Wed, 13 Dec 2023 23:29:40 +0900 Subject: [PATCH] feat: bump operator version to 2.9.0 --- README.md | 16 +++++++-------- acme/README.md | 2 +- backup/ansible/README.md | 2 +- galaxy/README.md | 28 +++++++++++++-------------- galaxy/pulp/galaxy.yaml | 12 ++++++------ operator/kustomization.yaml | 4 ++-- restore/README.md | 2 +- rulebooks/operator/kustomization.yaml | 4 ++-- rulebooks/server/eda.yaml | 8 ++------ tips/version-mapping.md | 1 + 10 files changed, 38 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index c513e95..7f0f20e 100644 --- a/README.md +++ b/README.md @@ -29,17 +29,17 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - Tested on: - CentOS Stream 8 (Minimal) - - K3s v1.27.7+k3s2 + - K3s v1.28.4+k3s2 - Products that will be deployed: - - AWX Operator 2.8.0 - - AWX 23.5.0 + - AWX Operator 2.9.0 + - AWX 23.5.1 - PostgreSQL 13 ## References - [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 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.8.0/README.md) @2.8.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.9.0/README.md) @2.9.0 ## 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. ```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 @@ -92,7 +92,7 @@ If you want to use files suitable for the specific version of AWX Operator, [ref cd ~ git clone https://github.com/kurokobo/awx-on-k3s.git cd awx-on-k3s -git checkout 2.8.0 +git checkout 2.9.0 ``` 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) ----- 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. diff --git a/acme/README.md b/acme/README.md index b8b0ef0..79da042 100644 --- a/acme/README.md +++ b/acme/README.md @@ -42,7 +42,7 @@ This guide does not provide any information how to configure Azure, other DNS se Deploy cert-manager first. ```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. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 6f306e4..b08422f 100644 --- a/backup/ansible/README.md +++ b/backup/ansible/README.md @@ -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.8.0/roles/backup) for acceptable fields. | `deployment_name: awx`
`backup_pvc: awx-backup-claim`
`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`
`backup_pvc: awx-backup-claim`
`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` | diff --git a/galaxy/README.md b/galaxy/README.md index 793e42c..17b87b2 100644 --- a/galaxy/README.md +++ b/galaxy/README.md @@ -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) -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 @@ -199,7 +199,7 @@ Install specified version of Pulp Operator. cd ~ git clone https://github.com/pulp/pulp-operator.git 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. @@ -313,8 +313,8 @@ When the deployment completes successfully, the logs end with: ```txt $ 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/controller.go:236 Operator tasks synced +2006-01-02T15:04:05Z INFO repo_manager/status.go:148 galaxy finished execution ... +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. @@ -383,7 +383,7 @@ Now your AWX is available at `https://galaxy.example.com/` or the hostname you s ## 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 @@ -394,26 +394,26 @@ Create a list of Collections to be synchronized as YAML file. collections: - name: community.general source: https://galaxy.ansible.com - version: ">=3.2.0" - - name: community.kubernetes + version: ">=8.0.0" + - name: kubernetes.core source: https://galaxy.ansible.com - version: "2.0.0" + version: "3.0.0" - name: community.vmware source: https://galaxy.ansible.com - version: ">=1.10.0,<1.12.0" + version: ">=3.10.0,<4.0.0" - name: awx.awx source: https://galaxy.ansible.com - version: ">=19.0.0" + version: ">=23.0.0" - name: ansible.utils 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 diff --git a/galaxy/pulp/galaxy.yaml b/galaxy/pulp/galaxy.yaml index 944f518..517b7d5 100644 --- a/galaxy/pulp/galaxy.yaml +++ b/galaxy/pulp/galaxy.yaml @@ -4,17 +4,17 @@ metadata: name: galaxy spec: # These parameters are designed for use with: - # - Pulp Operator: 1.0.0-beta.2 - # https://github.com/pulp/pulp-operator/blob/1.0.0-beta.2/README.md - # - Galaxy NG: 4.8.1 - # https://github.com/ansible/galaxy_ng/tree/4.8.1 + # - Pulp Operator: 1.0.0-beta.3 + # https://github.com/pulp/pulp-operator/blob/1.0.0-beta.3/README.md + # - Galaxy NG: 4.9.0 + # https://github.com/ansible/galaxy_ng/tree/4.9.0 deployment_type: 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_version: 4.8.1 + image_web_version: 4.9.0 admin_password_secret: galaxy-admin-password diff --git a/operator/kustomization.yaml b/operator/kustomization.yaml index b5e9b57..927d960 100644 --- a/operator/kustomization.yaml +++ b/operator/kustomization.yaml @@ -12,8 +12,8 @@ secretGenerator: - operator=awx resources: - - github.com/ansible/awx-operator/config/default?ref=2.8.0 + - github.com/ansible/awx-operator/config/default?ref=2.9.0 images: - name: quay.io/ansible/awx-operator - newTag: 2.8.0 + newTag: 2.9.0 diff --git a/restore/README.md b/restore/README.md index db3c3de..7fb4f1d 100644 --- a/restore/README.md +++ b/restore/README.md @@ -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) ----- 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. diff --git a/rulebooks/operator/kustomization.yaml b/rulebooks/operator/kustomization.yaml index dc2302b..09042ae 100644 --- a/rulebooks/operator/kustomization.yaml +++ b/rulebooks/operator/kustomization.yaml @@ -12,8 +12,8 @@ secretGenerator: - operator=eda 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: - name: quay.io/ansible/eda-server-operator - newTag: 0.0.9 + newTag: 0.0.10 diff --git a/rulebooks/server/eda.yaml b/rulebooks/server/eda.yaml index b81a3d8..ca30294 100644 --- a/rulebooks/server/eda.yaml +++ b/rulebooks/server/eda.yaml @@ -15,14 +15,10 @@ spec: automation_server_ssl_verify: no image: quay.io/ansible/eda-server - image_version: sha-70529ad + image_version: sha-f0228ed image_web: quay.io/ansible/eda-ui - image_web_version: 2.4.716 - - extra_settings: - - setting: EDA_CSRF_TRUSTED_ORIGINS - value: http://eda-api:8000 + image_web_version: 2.4.739 api: replicas: 1 diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 86560fb..0fee293 100644 --- a/tips/version-mapping.md +++ b/tips/version-mapping.md @@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions. | AWX Operator | AWX | | - | - | +| 2.9.0 | 23.5.1 | | 2.8.0 | 23.5.0 | | 2.7.2 | 23.4.0 | | 2.7.1 | 23.3.1 |