do a more consistent cluster type check for openshift (#832)

fixes: kiali/kiali#7841
kiali · Oct 28, 2024 · 45a5432 · 45a5432
1 parent 24f5deb
commit 45a5432
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/roles/default/kiali-deploy/tasks/main.yml b/roles/default/kiali-deploy/tasks/main.yml
@@ -26,8 +26,8 @@
 
 - name: Determine the cluster type
   set_fact:
-    is_openshift: "{{ True if 'route.openshift.io' in api_groups else False }}"
-    is_k8s: "{{ False if 'route.openshift.io' in api_groups else True }}"
+    is_openshift: "{{ True if 'operator.openshift.io' in api_groups else False }}"
+    is_k8s: "{{ False if 'operator.openshift.io' in api_groups else True }}"
   when:
   - is_openshift == False
   - is_k8s == False

diff --git a/roles/v1.57/kiali-deploy/tasks/main.yml b/roles/v1.57/kiali-deploy/tasks/main.yml
@@ -22,8 +22,8 @@
 
 - name: Determine the cluster type
   set_fact:
-    is_openshift: "{{ True if 'route.openshift.io' in api_groups else False }}"
-    is_k8s: "{{ False if 'route.openshift.io' in api_groups else True }}"
+    is_openshift: "{{ True if 'operator.openshift.io' in api_groups else False }}"
+    is_k8s: "{{ False if 'operator.openshift.io' in api_groups else True }}"
   when:
   - is_openshift == False
   - is_k8s == False

diff --git a/roles/v1.65/kiali-deploy/tasks/main.yml b/roles/v1.65/kiali-deploy/tasks/main.yml
@@ -26,8 +26,8 @@
 
 - name: Determine the cluster type
   set_fact:
-    is_openshift: "{{ True if 'route.openshift.io' in api_groups else False }}"
-    is_k8s: "{{ False if 'route.openshift.io' in api_groups else True }}"
+    is_openshift: "{{ True if 'operator.openshift.io' in api_groups else False }}"
+    is_k8s: "{{ False if 'operator.openshift.io' in api_groups else True }}"
   when:
   - is_openshift == False
   - is_k8s == False

diff --git a/roles/v1.73/kiali-deploy/tasks/main.yml b/roles/v1.73/kiali-deploy/tasks/main.yml
@@ -26,8 +26,8 @@
 
 - name: Determine the cluster type
   set_fact:
-    is_openshift: "{{ True if 'route.openshift.io' in api_groups else False }}"
-    is_k8s: "{{ False if 'route.openshift.io' in api_groups else True }}"
+    is_openshift: "{{ True if 'operator.openshift.io' in api_groups else False }}"
+    is_k8s: "{{ False if 'operator.openshift.io' in api_groups else True }}"
   when:
   - is_openshift == False
   - is_k8s == False

diff --git a/roles/v1.89/kiali-deploy/tasks/main.yml b/roles/v1.89/kiali-deploy/tasks/main.yml
@@ -26,8 +26,8 @@
 
 - name: Determine the cluster type
   set_fact:
-    is_openshift: "{{ True if 'route.openshift.io' in api_groups else False }}"
-    is_k8s: "{{ False if 'route.openshift.io' in api_groups else True }}"
+    is_openshift: "{{ True if 'operator.openshift.io' in api_groups else False }}"
+    is_k8s: "{{ False if 'operator.openshift.io' in api_groups else True }}"
   when:
   - is_openshift == False
   - is_k8s == False