From 78460412bfca629bdd7a84c2317b0182ea8ff92a Mon Sep 17 00:00:00 2001
From: Ishwar Kanse <ikanse@redhat.com>
Date: Thu, 20 Feb 2025 21:14:35 +0530
Subject: [PATCH] Update tests to resolve OSSM Kiali issue (#1129)

Co-authored-by: Andreas Gerstmayr <agerstmayr@redhat.com>
---
 .../install-ossm-assert.yaml                     | 16 ----------------
 .../ossm-monolithic-otel/update-kiali.yaml       |  3 +++
 .../install-ossm-assert.yaml                     | 16 ----------------
 .../ossm-tempostack-otel/update-kiali.yaml       |  3 +++
 .../ossm-tempostack/install-ossm-assert.yaml     | 16 ----------------
 .../ossm-tempostack/update-kiali.yaml            |  3 +++
 6 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-ossm-assert.yaml b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-ossm-assert.yaml
index 7dd929d75..281755330 100644
--- a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-ossm-assert.yaml
+++ b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-ossm-assert.yaml
@@ -83,19 +83,3 @@ status:
   - otlp-app
   - tracing-system
 
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    app: kiali
-    app.kubernetes.io/instance: kiali
-    app.kubernetes.io/name: kiali
-    app.kubernetes.io/part-of: kiali
-  namespace: istio-system
-status:
-  containerStatuses:
-  - name: kiali
-    ready: true
-    started: true
-  phase: Running
diff --git a/tests/e2e-openshift-ossm/ossm-monolithic-otel/update-kiali.yaml b/tests/e2e-openshift-ossm/ossm-monolithic-otel/update-kiali.yaml
index 773ead7ba..e00abf8ea 100644
--- a/tests/e2e-openshift-ossm/ossm-monolithic-otel/update-kiali.yaml
+++ b/tests/e2e-openshift-ossm/ossm-monolithic-otel/update-kiali.yaml
@@ -4,6 +4,9 @@ metadata:
   name: kiali
   namespace: istio-system
 spec:
+  kiali_feature_flags:
+    certificates_information_indicators:
+      enabled: false
   external_services:
     tracing:
       query_timeout: 30
diff --git a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-ossm-assert.yaml b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-ossm-assert.yaml
index 06140bb61..124c3ed9e 100644
--- a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-ossm-assert.yaml
+++ b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-ossm-assert.yaml
@@ -72,19 +72,3 @@ status:
   - otlp-app
   - tracing-system
 
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    app: kiali
-    app.kubernetes.io/instance: kiali
-    app.kubernetes.io/name: kiali
-    app.kubernetes.io/part-of: kiali
-  namespace: istio-system
-status:
-  containerStatuses:
-  - name: kiali
-    ready: true
-    started: true
-  phase: Running
diff --git a/tests/e2e-openshift-ossm/ossm-tempostack-otel/update-kiali.yaml b/tests/e2e-openshift-ossm/ossm-tempostack-otel/update-kiali.yaml
index 03921a15f..872137e9a 100644
--- a/tests/e2e-openshift-ossm/ossm-tempostack-otel/update-kiali.yaml
+++ b/tests/e2e-openshift-ossm/ossm-tempostack-otel/update-kiali.yaml
@@ -4,6 +4,9 @@ metadata:
   name: kiali
   namespace: istio-system
 spec:
+  kiali_feature_flags:
+    certificates_information_indicators:
+      enabled: false
   external_services:
     tracing:
       query_timeout: 30
diff --git a/tests/e2e-openshift-ossm/ossm-tempostack/install-ossm-assert.yaml b/tests/e2e-openshift-ossm/ossm-tempostack/install-ossm-assert.yaml
index 2362101e7..f622b420d 100644
--- a/tests/e2e-openshift-ossm/ossm-tempostack/install-ossm-assert.yaml
+++ b/tests/e2e-openshift-ossm/ossm-tempostack/install-ossm-assert.yaml
@@ -55,19 +55,3 @@ status:
   - bookinfo
   - tracing-system
 
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    app: kiali
-    app.kubernetes.io/instance: kiali
-    app.kubernetes.io/name: kiali
-    app.kubernetes.io/part-of: kiali
-  namespace: istio-system
-status:
-  containerStatuses:
-  - name: kiali
-    ready: true
-    started: true
-  phase: Running
diff --git a/tests/e2e-openshift-ossm/ossm-tempostack/update-kiali.yaml b/tests/e2e-openshift-ossm/ossm-tempostack/update-kiali.yaml
index 03921a15f..872137e9a 100644
--- a/tests/e2e-openshift-ossm/ossm-tempostack/update-kiali.yaml
+++ b/tests/e2e-openshift-ossm/ossm-tempostack/update-kiali.yaml
@@ -4,6 +4,9 @@ metadata:
   name: kiali
   namespace: istio-system
 spec:
+  kiali_feature_flags:
+    certificates_information_indicators:
+      enabled: false
   external_services:
     tracing:
       query_timeout: 30