From ba8ec0355c4ba7cb94c38d413eab38ef4ce92beb Mon Sep 17 00:00:00 2001 From: kurokobo Date: Wed, 1 May 2024 23:10:31 +0900 Subject: [PATCH] feat: bump galaxy operator version to 2024.5.1 (#357) --- galaxy/README.md | 14 +++++++------- galaxy/galaxy/galaxy.yaml | 5 +++-- galaxy/galaxy/kustomization.yaml | 2 +- galaxy/galaxy/pv.yaml | 4 ++-- galaxy/operator/kustomization.yaml | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/galaxy/README.md b/galaxy/README.md index 69d53bd..4da2273 100644 --- a/galaxy/README.md +++ b/galaxy/README.md @@ -34,7 +34,7 @@ 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.30 +- Galaxy Operator 2024.5.1 - Galaxy NG - Service: b7b07e96 - UI: 19fd5a2b @@ -105,7 +105,7 @@ Modify two `password`s in `galaxy/galaxy/kustomization.yaml`. - name: galaxy-postgres-configuration type: Opaque literals: - - host=galaxy-postgres-13 + - host=galaxy-postgres-15 - port=5432 - database=galaxy - username=galaxy @@ -124,7 +124,7 @@ Prepare directories for Persistent Volumes defined in `galaxy/galaxy/pv.yaml`. ```bash -sudo mkdir -p /data/galaxy/postgres-13 +sudo mkdir -p /data/galaxy/postgres-15 sudo mkdir -p /data/galaxy/file sudo chown 1000:0 /data/galaxy/file sudo mkdir -p /data/galaxy/redis @@ -153,7 +153,7 @@ $ kubectl -n galaxy logs -f deployments/galaxy-operator-controller-manager ... ----- Ansible Task Status Event StdOut (galaxy.ansible.com/v1beta1, Kind=Galaxy, galaxy/galaxy) ----- PLAY RECAP ********************************************************************* -localhost : ok=131 changed=25 unreachable=0 failed=0 skipped=82 rescued=0 ignored=0 +localhost : ok=140 changed=25 unreachable=0 failed=0 skipped=87 rescued=0 ignored=0 ``` Required objects has been deployed next to Pulp Operator in `galaxy` namespace. @@ -166,7 +166,7 @@ galaxy.galaxy.ansible.com/galaxy 4m44s NAME READY STATUS RESTARTS AGE pod/galaxy-operator-controller-manager-69bdb6886d-klh28 2/2 Running 0 4m29s -pod/galaxy-postgres-13-0 1/1 Running 0 3m45s +pod/galaxy-postgres-15-0 1/1 Running 0 3m45s pod/galaxy-redis-994cbcbff-46m95 1/1 Running 0 3m26s pod/galaxy-worker-5ffd987855-g56rt 1/1 Running 0 3m30s pod/galaxy-api-75d6bf46b8-lbt4z 1/1 Running 0 3m19s @@ -175,7 +175,7 @@ pod/galaxy-web-7f75d4c888-bg5pt 1/1 Running 0 NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE service/galaxy-operator-controller-manager-metrics-service ClusterIP 10.43.73.43 8443/TCP 4m29s -service/galaxy-postgres-13 ClusterIP None 5432/TCP 3m45s +service/galaxy-postgres-15 ClusterIP None 5432/TCP 3m45s service/galaxy-web-svc ClusterIP 10.43.114.49 24880/TCP 3m39s service/galaxy-content-svc ClusterIP 10.43.9.181 24816/TCP 3m37s service/galaxy-redis-svc ClusterIP 10.43.20.127 6379/TCP 3m27s @@ -198,7 +198,7 @@ replicaset.apps/galaxy-content-6d7dd695c5 1 1 replicaset.apps/galaxy-web-7f75d4c888 1 1 1 3m40s NAME READY AGE -statefulset.apps/galaxy-postgres-13 1/1 3m45s +statefulset.apps/galaxy-postgres-15 1/1 3m45s NAME CLASS HOSTS ADDRESS PORTS AGE ingress.networking.k8s.io/galaxy-ingress traefik galaxy.example.com 192.168.0.221 80, 443 2m9s diff --git a/galaxy/galaxy/galaxy.yaml b/galaxy/galaxy/galaxy.yaml index fde6a45..b55e45f 100644 --- a/galaxy/galaxy/galaxy.yaml +++ b/galaxy/galaxy/galaxy.yaml @@ -4,8 +4,8 @@ metadata: name: galaxy spec: # These parameters are designed for use with: - # - Galaxy Operator: 2024.4.30 - # https://github.com/ansible/galaxy-operator/blob/2024.4.30/README.md + # - Galaxy Operator: 2024.5.1 + # https://github.com/ansible/galaxy-operator/blob/2024.5.1/README.md image: quay.io/ansible/galaxy-ng image_version: b7b07e96 @@ -24,6 +24,7 @@ spec: file_storage_size: 8Gi postgres_configuration_secret: galaxy-postgres-configuration + postgres_data_volume_init: true postgres_storage_class: galaxy-postgres-volume postgres_storage_requirements: requests: diff --git a/galaxy/galaxy/kustomization.yaml b/galaxy/galaxy/kustomization.yaml index d371cd1..84fddd6 100644 --- a/galaxy/galaxy/kustomization.yaml +++ b/galaxy/galaxy/kustomization.yaml @@ -16,7 +16,7 @@ secretGenerator: - name: galaxy-postgres-configuration type: Opaque literals: - - host=galaxy-postgres-13 + - host=galaxy-postgres-15 - port=5432 - database=galaxy - username=galaxy diff --git a/galaxy/galaxy/pv.yaml b/galaxy/galaxy/pv.yaml index 6dafe31..dd895be 100644 --- a/galaxy/galaxy/pv.yaml +++ b/galaxy/galaxy/pv.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: galaxy-postgres-13-volume + name: galaxy-postgres-15-volume spec: accessModes: - ReadWriteOnce @@ -11,7 +11,7 @@ spec: storage: 8Gi storageClassName: galaxy-postgres-volume hostPath: - path: /data/galaxy/postgres-13 + path: /data/galaxy/postgres-15 --- apiVersion: v1 diff --git a/galaxy/operator/kustomization.yaml b/galaxy/operator/kustomization.yaml index 33d6b6f..1439a01 100644 --- a/galaxy/operator/kustomization.yaml +++ b/galaxy/operator/kustomization.yaml @@ -12,8 +12,8 @@ secretGenerator: - operator=eda resources: - - github.com/ansible/galaxy-operator/config/default?ref=2024.4.30 + - github.com/ansible/galaxy-operator/config/default?ref=2024.5.1 images: - name: quay.io/ansible/galaxy-operator - newTag: 2024.4.30 + newTag: 2024.5.1