✨ Workaround RHSSO bug by renaming the postgresql service (#224)

Signed-off-by: Jason Montleon <jmontleo@redhat.com>
konveyor · May 11, 2023 · 7e9c64c · 7e9c64c
1 parent 2b4d046
commit 7e9c64c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml
@@ -88,6 +88,7 @@ keycloak_database_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_KEYCLOAK_DATABASE
 keycloak_database_name: "keycloak"
 keycloak_database_component_name: "postgresql"
 keycloak_database_service_name: "{{ app_name }}-{{ keycloak_database_name }}-{{ keycloak_database_component_name }}"
+keycloak_database_service_k8s_resource_name: "{{ app_name }}-kcpgsql"
 keycloak_database_secret_name: "{{ keycloak_database_service_name }}"
 keycloak_database_deployment_name: "{{ keycloak_database_service_name }}"
 keycloak_database_deployment_strategy: "Recreate"

diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml
@@ -73,6 +73,14 @@
             state: present
             definition: "{{ lookup('template', 'secret-keycloak-postgresql.yml.j2') }}"
 
+    - name: "Delete old Keycloak PostgreSQL Service"
+      k8s:
+        state: absent
+        kind: Service
+        api_version: v1
+        name: "{{ keycloak_database_service_name }}"
+        namespace: "{{ app_namespace }}"
+
     - name: "Setup Keycloak PostgreSQL Service"
       k8s:
         state: present
@@ -175,7 +183,7 @@
     - name: "Collect service name components"
       set_fact:
         pgsql_svc_fqdn_parts:
-          - "{{ keycloak_database_service_name }}"
+          - "{{ keycloak_database_service_k8s_resource_name }}"
           - "{{ app_namespace }}"
           - "svc"
           - "{{ default_dns_operator.resources[0].status.clusterDomain }}"

diff --git a/roles/tackle/templates/deployment-keycloak-sso.yml.j2 b/roles/tackle/templates/deployment-keycloak-sso.yml.j2
@@ -61,7 +61,7 @@ spec:
             - name: DB_VENDOR
               value: postgres
             - name: DB_ADDR
-              value: {{ keycloak_database_service_name }}
+              value: {{ keycloak_database_service_k8s_resource_name }}
             - name: DB_DATABASE
               valueFrom:
                 secretKeyRef:

diff --git a/roles/tackle/templates/service-keycloak-postgresql.yml.j2 b/roles/tackle/templates/service-keycloak-postgresql.yml.j2
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name: {{ keycloak_database_service_name }}
     app.kubernetes.io/component: {{ keycloak_database_component_name }}
     app.kubernetes.io/part-of: {{ app_name }}
-  name: {{ keycloak_database_service_name }}
+  name: {{ keycloak_database_service_k8s_resource_name }}
   namespace: {{ app_namespace }}
 spec:
   ports: