From 551dedc6827327fe88cbebd671f10ec458776975 Mon Sep 17 00:00:00 2001 From: Marek Szwalkiewicz Date: Thu, 8 Jan 2026 13:59:58 +0100 Subject: [PATCH] [PLATFORM] Fix assumption abour serviceMesh In default values there is no service mesh defined and in result it broke rendering of 2 deployment components that assumed the data is present. Issue-ID: OOM-3376 Change-Id: I7d68b4e0668e060501a71c9997f64f08976de3b2 Signed-off-by: Marek Szwalkiewicz --- .../platform/components/cmpv2-cert-provider/templates/deployment.yaml | 4 ++-- .../platform/components/oom-cert-service/templates/deployment.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml index 3513c21d1a..25c7ade829 100644 --- a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml +++ b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml @@ -34,10 +34,10 @@ spec: control-plane: controller-manager {{- if (include "common.onServiceMesh" . | nindent 6 ) }} annotations: - {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }} + {{- if and .Values.global.serviceMesh (eq .Values.global.serviceMesh.engine "linkerd") }} linkerd.io/inject: disabled {{- end }} - {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }} + {{- if and .Values.global.serviceMesh (eq .Values.global.serviceMesh.engine "istio") }} traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443" traffic.sidecar.istio.io/includeInboundPorts: '*' {{- end }} diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml index e74c5424e5..ea8533248e 100644 --- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml +++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml @@ -24,10 +24,10 @@ spec: metadata: {{- include "common.templateMetadata" . | nindent 6 }} {{- if (include "common.onServiceMesh" . ) }} annotations: - {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }} + {{- if and .Values.global.serviceMesh (eq .Values.global.serviceMesh.engine "linkerd") }} linkerd.io/inject: disabled {{- end }} - {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }} + {{- if and .Values.global.serviceMesh (eq .Values.global.serviceMesh.engine "istio") }} traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443" traffic.sidecar.istio.io/includeInboundPorts: '*' {{- end }} -- 2.16.6