aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib/components/ejbca/templates
diff options
context:
space:
mode:
authorJack Lucas <jflos@sonoris.net>2022-06-22 15:00:18 +0000
committerGerrit Code Review <gerrit@onap.org>2022-06-22 15:00:18 +0000
commitc51624459fbc94385c38584b45121f724251771a (patch)
tree35a8a8e32959312df1d7ae912d9ca02601fb36cc /kubernetes/contrib/components/ejbca/templates
parentf5746c86bc67ca7689579d121c02527e21910dc0 (diff)
parent527662ff89b476c3616b94e6882469d1e8cb2f33 (diff)
Merge "[CONTRIB] EJBCA ServiceMesh compatibility"
Diffstat (limited to 'kubernetes/contrib/components/ejbca/templates')
-rw-r--r--kubernetes/contrib/components/ejbca/templates/deployment.yaml16
1 files changed, 15 insertions, 1 deletions
diff --git a/kubernetes/contrib/components/ejbca/templates/deployment.yaml b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
index 6bd5b259ea..a36dcacb23 100644
--- a/kubernetes/contrib/components/ejbca/templates/deployment.yaml
+++ b/kubernetes/contrib/components/ejbca/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" }}
+ sidecar.istio.io/rewriteAppHTTPProbers: "false"
+ proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }'
+ {{- end }}
+ {{- end }}
spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
@@ -51,7 +61,11 @@ spec:
lifecycle:
postStart:
exec:
- command: ["/bin/sh", "-c", "/opt/primekey/scripts/ejbca-config.sh"]
+ command:
+ - sh
+ - -c
+ - |
+ sleep 60; /opt/primekey/scripts/ejbca-config.sh
volumeMounts:
- name: "{{ include "common.fullname" . }}-volume"
mountPath: /opt/primekey/scripts/