console links

kiali · Oct 25, 2023 · 5498910 · 5498910
1 parent 8e7a386
commit 5498910
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 0 deletions.
diff --git a/roles/default/kiali-deploy/tasks/openshift/os-main.yml b/roles/default/kiali-deploy/tasks/openshift/os-main.yml
@@ -4,6 +4,16 @@
   when:
   - is_openshift == True
 
+# If it is Removed, the web console is disabled.
+# See: https://docs.openshift.com/container-platform/4.13/web_console/disabling-web-console.html
+- name: Determine if OpenShift Console is installed and enabled
+  vars:
+    console_res: "{{ query('kubernetes.core.k8s', resource_name='cluster', api_version='operator.openshift.io/v1', kind='Console', errors='ignore') }}"
+  set_fact:
+    has_openshift_console: "{{ console_res | length > 0 and console_res[0].spec.managementState != 'Removed' }}"
+  when:
+  - is_openshift == True
+
 - name: Create Kiali objects on OpenShift
   include_tasks: process-resource.yml
   vars:
@@ -95,6 +105,8 @@
       {% endfor %}
   when:
   - is_openshift == True
+  - has_openshift_console is defined
+  - has_openshift_console == True
   - no_longer_accessible_namespaces is defined
 
 - name: Process OpenShift Console Links

diff --git a/roles/default/kiali-remove/tasks/main.yml b/roles/default/kiali-remove/tasks/main.yml
@@ -239,6 +239,17 @@
   when:
   - is_openshift == True
 
+# If it is Removed, the web console is disabled.
+# See: https://docs.openshift.com/container-platform/4.13/web_console/disabling-web-console.html
+- name: Determine if OpenShift Console is installed and enabled
+  ignore_errors: yes
+  vars:
+    console_res: "{{ query('kubernetes.core.k8s', resource_name='cluster', api_version='operator.openshift.io/v1', kind='Console', errors='ignore') }}" 
+  set_fact:
+    has_openshift_console: "{{ console_res | length > 0 and console_res[0].spec.managementState != 'Removed' }}"
+  when:
+  - is_openshift == True
+
 - name: Delete OpenShift-specific Kiali ConsoleLinks
   ignore_errors: yes
   k8s:
@@ -254,3 +265,5 @@
       {% endfor %}
   when:
   - is_openshift == True
+  - has_openshift_console is defined
+  - has_openshift_console == True
diff --git a/roles/v1.73/kiali-deploy/tasks/openshift/os-main.yml b/roles/v1.73/kiali-deploy/tasks/openshift/os-main.yml
@@ -4,6 +4,16 @@
   when:
   - is_openshift == True
 
+# If it is Removed, the web console is disabled.
+# See: https://docs.openshift.com/container-platform/4.13/web_console/disabling-web-console.html
+- name: Determine if OpenShift Console is installed and enabled
+  vars:
+    console_res: "{{ query('kubernetes.core.k8s', resource_name='cluster', api_version='operator.openshift.io/v1', kind='Console', errors='ignore') }}"
+  set_fact:
+    has_openshift_console: "{{ console_res | length > 0 and console_res[0].spec.managementState != 'Removed' }}"
+  when:
+  - is_openshift == True
+
 - name: Create Kiali objects on OpenShift
   include_tasks: process-resource.yml
   vars:
@@ -95,6 +105,8 @@
       {% endfor %}
   when:
   - is_openshift == True
+  - has_openshift_console is defined
+  - has_openshift_console == True
   - no_longer_accessible_namespaces is defined
 
 - name: Process OpenShift Console Links

diff --git a/roles/v1.73/kiali-remove/tasks/main.yml b/roles/v1.73/kiali-remove/tasks/main.yml
@@ -239,6 +239,17 @@
   when:
   - is_openshift == True
 
+# If it is Removed, the web console is disabled.
+# See: https://docs.openshift.com/container-platform/4.13/web_console/disabling-web-console.html
+- name: Determine if OpenShift Console is installed and enabled
+  ignore_errors: yes
+  vars:
+    console_res: "{{ query('kubernetes.core.k8s', resource_name='cluster', api_version='operator.openshift.io/v1', kind='Console', errors='ignore') }}" 
+  set_fact:
+    has_openshift_console: "{{ console_res | length > 0 and console_res[0].spec.managementState != 'Removed' }}"
+  when:
+  - is_openshift == True
+
 - name: Delete OpenShift-specific Kiali ConsoleLinks
   ignore_errors: yes
   k8s:
@@ -254,3 +265,5 @@
       {% endfor %}
   when:
   - is_openshift == True
+  - has_openshift_console is defined
+  - has_openshift_console == True