Specify Redis 7 image explicitly so that when we bump the version it …

…will be intentional
ansible · Mar 11, 2024 · 30b59ec · 30b59ec
1 parent 9fd1b62
commit 30b59ec
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -60,7 +60,7 @@ spec:
             - name: RELATED_IMAGE_GALAXY_WEB
               value: quay.io/ansible/galaxy-ui:latest
             - name: RELATED_IMAGE_GALAXY_REDIS
-              value: redis:latest
+              value: redis:7
             - name: RELATED_IMAGE_GALAXY_POSTGRES
               value: quay.io/sclorg/postgresql-15-c9s:latest
             - name: RELATED_IMAGE_GALAXY_INIT_GPG_CONTAINER

diff --git a/config/manifests/bases/galaxy-operator.clusterserviceversion.yaml b/config/manifests/bases/galaxy-operator.clusterserviceversion.yaml
@@ -938,7 +938,7 @@ spec:
                 - name: RELATED_IMAGE_GALAXY_WEB
                   value: quay.io/ansible/galaxy-ui:latest
                 - name: RELATED_IMAGE_GALAXY_REDIS
-                  value: redis:latest
+                  value: redis:7
                 - name: RELATED_IMAGE_GALAXY_POSTGRES
                   value: quay.io/sclorg/postgresql-15-c9s:latest
                 - name: RELATED_IMAGE_GALAXY_INIT_GPG_CONTAINER

diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-_postgres_image: postgres
+_postgres_image: quay.io/sclorg/postgresql-15-c9s:latest
 
 postgres_storage_requirements:
   requests:

diff --git a/roles/postgres/tasks/upgrade_postgres.yml b/roles/postgres/tasks/upgrade_postgres.yml
@@ -122,18 +122,6 @@
   set_fact:
     postgres_pod_name: "{{ postgres_pod['resources'][0]['metadata']['name'] }}"
 
-- name: Get the name of the service for the old postgres pod
-  k8s_info:
-    kind: Service
-    namespace: "{{ ansible_operator_meta.namespace }}"
-    label_selectors:
-      - "app.kubernetes.io/component=database"
-      - "app.kubernetes.io/instance=postgres-{{ ansible_operator_meta.name }}"
-      - "app.kubernetes.io/version={{ supported_pg_version }}"
-      - "app.kubernetes.io/managed-by={{ deployment_type }}-operator"
-  register: old_postgres_svc
-
-# TODO: The galaxy-operator labels are different. potential issue here.
 - name: Get the name of the service for the old postgres pod
   k8s_info:
     kind: Service

diff --git a/roles/redis/README.md b/roles/redis/README.md
@@ -10,7 +10,7 @@ A role to setup Galaxyredis, yielding the following objects:
 Role Variables
 --------------
 
-* `redis_image`: The redis image name. Default: redis:latest
+* `redis_image`: The redis image name. Default: redis:7
 
 Requirements
 ------------

diff --git a/roles/redis/defaults/main.yml b/roles/redis/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-_redis_image: redis:latest
+_redis_image: redis:7
 
 redis_storage_size: 1Gi
 # Here we use  _galaxy_ansible_com_galaxy to get un-modified cr