diff options
| author |   Radoslaw Chmiel <r.chmiel@partner.samsung.com> | 2022-06-02 19:17:12 +0200 |
|---|---|---|
| committer | Radoslaw Chmiel <r.chmiel@partner.samsung.com> | 2022-06-03 11:31:19 +0200 |
| commit | f3fbbe4afbe13e332dc2080fe3d2ca7aa997064b (patch) | |
| tree | a93b72790ed33c13ba4ffd373727d74a78407922 /kubernetes | |
| parent | c8d7cd06f9284c35242429ff0c84ac75efe44fed (diff) | |
[PLATFORM] Platform ServiceMesh compatibility
cmpv2-cert-provider and oom-cert-service charts changes to make it work with SM
Issue-ID: OOM-2980
Signed-off-by: Radoslaw Chmiel <r.chmiel@partner.samsung.com>
Change-Id: Ib952a6b43136a7dc72bf45b029c864862b2182a4
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/platform/components/oom-cert-service/templates/deployment.yaml | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml index c49762202b..ce5e410abe 100644 --- a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml +++ b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml @@ -32,6 +32,16 @@ spec: metadata: labels: control-plane: controller-manager + {{- if (include "common.onServiceMesh" . | nindent 6 ) }} + annotations: + {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }} + linkerd.io/inject: disabled + {{- end }} + {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }} + traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443" + traffic.sidecar.istio.io/includeInboundPorts: '*' + {{- end }} + {{- end }} spec: imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml index 8215ed949e..5f80a7dc75 100644 --- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml +++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml @@ -22,6 +22,16 @@ spec: selector: {{- include "common.selectors" . | nindent 4 }} template: metadata: {{- include "common.templateMetadata" . | nindent 6 }} + {{- if (include "common.onServiceMesh" . ) }} + annotations: + {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }} + linkerd.io/inject: disabled + {{- end }} + {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }} + traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443" + traffic.sidecar.istio.io/includeInboundPorts: '*' + {{- end }} + {{- end }} spec: imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |