Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[SDC] Top up sdc-helm-validator image to 1.2.1"
[oom.git]
/
kubernetes
/
dcaegen2-services
/
common
/
dcaegen2-services-common
/
templates
/
_deployment.tpl
diff --git
a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index
1e7c3b4
..
328a4c6
100644
(file)
--- a/
kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/
kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@
-274,6
+274,10
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
env:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
env:
+ {{- range $cred := .Values.credentials }}
+ - name: {{ $cred.name }}
+ {{- include "common.secret.envFromSecretFast" (dict "global" $ "uid" $cred.uid "key" $cred.key) | indent 10 }}
+ {{- end }}
{{- if $certDir }}
- name: DCAE_CA_CERTPATH
value: {{ $certDir }}/cacert.pem
{{- if $certDir }}
- name: DCAE_CA_CERTPATH
value: {{ $certDir }}/cacert.pem
@@
-317,6
+321,8
@@
spec:
volumeMounts:
- mountPath: /app-config
name: app-config
volumeMounts:
- mountPath: /app-config
name: app-config
+ - mountPath: /app-config-input
+ name: app-config-input
{{- if $logDir }}
- mountPath: {{ $logDir}}
name: component-log
{{- if $logDir }}
- mountPath: {{ $logDir}}
name: component-log
@@
-489,7
+495,7
@@
spec:
*/}}
{{- define "dcaegen2-services-common.shouldUseCmpv2Certificates" -}}
{{- $certDir := default "" .Values.certDirectory . -}}
*/}}
{{- define "dcaegen2-services-common.shouldUseCmpv2Certificates" -}}
{{- $certDir := default "" .Values.certDirectory . -}}
- {{- if (and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.
global.CMPv2CertManagerIntegration .Values.
useCmpv2Certificates) -}}
+ {{- if (and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.useCmpv2Certificates) -}}
true
{{- end -}}
{{- end -}}
true
{{- end -}}
{{- end -}}