Merge branch 'main' into fix_certificate_issue

grafana · Feb 20, 2025 · 5adf9db · 5adf9db
2 parents db9a3c2 + 7846041
commit 5adf9db
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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