Fix update_status.yml issue when finding api route

ansible · Sep 3, 2024 · 9451cef · 9451cef
1 parent 43e7ae8
commit 9451cef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dev/eda-cr/eda-openshift-cr.yml b/dev/eda-cr/eda-openshift-cr.yml
@@ -13,6 +13,9 @@ spec:
     - redhat-operators-pull-secret
   admin_password_secret: custom-admin-password
 
+  # Disable UI
+  ui_disabled: false
+
   # -- Example image overrides
   # image: quay.io/ansible/eda-server
   # image_version: main

diff --git a/roles/eda/tasks/update_status.yml b/roles/eda/tasks/update_status.yml
@@ -41,7 +41,7 @@
         api_version: 'route.openshift.io/v1'
         kind: Route
         namespace: '{{ ansible_operator_meta.namespace }}'
-        name: '{{ ui_disabled | bool | ternary(ansible_operator_meta.name + "-api", ansible_operator_meta.name) }}'
+        name: "{{ ansible_operator_meta.name }}{{ '' if ui_disabled else '-ui' }}"
       register: route_url
 
     - name: Update URL status

diff --git a/roles/eda/templates/eda-ui.ingress.yaml.j2 b/roles/eda/templates/eda-ui.ingress.yaml.j2
@@ -5,7 +5,7 @@ apiVersion: '{{ ingress_api_version }}'
 {% endif %}
 kind: Ingress
 metadata:
-  name: '{{ ansible_operator_meta.name }}-ingress'
+  name: '{{ ansible_operator_meta.name }}-ui-ingress'
   namespace: '{{ ansible_operator_meta.namespace }}'
   labels:
     {{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}
@@ -52,7 +52,7 @@ apiVersion: '{{ route_api_version }}'
 {% endif %}
 kind: Route
 metadata:
-  name: '{{ ansible_operator_meta.name }}'
+  name: '{{ ansible_operator_meta.name }}-ui'
   namespace: '{{ ansible_operator_meta.namespace }}'
   labels:
     {{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}