From 238cde308a9da3aef153d3ab4484e587c25d1f96 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Fri, 18 Jun 2021 17:01:04 +0300 Subject: [PATCH 1/2] disable monitoring if istio is enabled --- openshift-knative-operator/pkg/serving/extension.go | 5 +++++ openshift-knative-operator/pkg/serving/extension_test.go | 1 + 2 files changed, 6 insertions(+) diff --git a/openshift-knative-operator/pkg/serving/extension.go b/openshift-knative-operator/pkg/serving/extension.go index 631377c80a..27a3bb7022 100644 --- a/openshift-knative-operator/pkg/serving/extension.go +++ b/openshift-knative-operator/pkg/serving/extension.go @@ -116,6 +116,11 @@ func (e *extension) Reconcile(ctx context.Context, comp v1alpha1.KComponent) err Type: "ConfigMap", } } + + // Temporary fix for SRVKS-743 + if ks.Spec.Ingress.Istio.Enabled { + common.Configure(&ks.Spec.CommonSpec, monitoring.ObservabilityCMName, monitoring.ObservabilityBackendKey, "none") + } return monitoring.ReconcileMonitoringForServing(ctx, e.kubeclient, ks) } diff --git a/openshift-knative-operator/pkg/serving/extension_test.go b/openshift-knative-operator/pkg/serving/extension_test.go index b77d03779a..0f9430a194 100644 --- a/openshift-knative-operator/pkg/serving/extension_test.go +++ b/openshift-knative-operator/pkg/serving/extension_test.go @@ -163,6 +163,7 @@ func TestReconcile(t *testing.T) { }, } common.Configure(&ks.Spec.CommonSpec, "network", "ingress.class", istioIngressClassName) + common.Configure(&ks.Spec.CommonSpec, monitoring.ObservabilityCMName, monitoring.ObservabilityBackendKey, "none") }), }, { name: "fix 'wrong' ingress config", // https://github.com/knative/operator/issues/568 From 514caa2033e53c0b7eb504a00b6d8318cad40cb8 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Fri, 18 Jun 2021 17:08:36 +0300 Subject: [PATCH 2/2] configure if unset --- openshift-knative-operator/pkg/serving/extension.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-knative-operator/pkg/serving/extension.go b/openshift-knative-operator/pkg/serving/extension.go index 27a3bb7022..689f5869dd 100644 --- a/openshift-knative-operator/pkg/serving/extension.go +++ b/openshift-knative-operator/pkg/serving/extension.go @@ -119,7 +119,7 @@ func (e *extension) Reconcile(ctx context.Context, comp v1alpha1.KComponent) err // Temporary fix for SRVKS-743 if ks.Spec.Ingress.Istio.Enabled { - common.Configure(&ks.Spec.CommonSpec, monitoring.ObservabilityCMName, monitoring.ObservabilityBackendKey, "none") + common.ConfigureIfUnset(&ks.Spec.CommonSpec, monitoring.ObservabilityCMName, monitoring.ObservabilityBackendKey, "none") } return monitoring.ReconcileMonitoringForServing(ctx, e.kubeclient, ks) }