[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 <marek.szwalkiewicz@external.t-mobile.pl>

diff --git a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
index 3513c21..25c7ade 100644 (file)
--- 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 e74c542..ea85332 100644 (file)
--- 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 }}