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 "[HOLMES] Remove AAF dependency and support SM"
[oom.git]
/
kubernetes
/
so
/
components
/
so-appc-orchestrator
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
b/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
index
24592ba
..
232bd6a
100644
(file)
--- a/
kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
+++ b/
kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
@@
-41,7
+41,7
@@
spec:
env:
- name: ACTUATOR_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "password") | indent 10 }}
env:
- name: ACTUATOR_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "password") | indent 10 }}
- image: {{
.Values.global.dockerHubRepository }}/{{ .Values.global.htpasswdImage
}}
+ image: {{
include "repositoryGenerator.image.htpasswd" .
}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: encoder
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: encoder
@@
-55,15
+55,14
@@
spec:
- |
export ACTUATOR_PASSWORD="$(cat /tmp/app/encoded)"
{{- if .Values.global.aafEnabled }}
- |
export ACTUATOR_PASSWORD="$(cat /tmp/app/encoded)"
{{- if .Values.global.aafEnabled }}
- export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
- export TRUSTSTORE_PASSWORD="${cadi_truststore_password}"
+ export $(cat {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
{{- if .Values.global.security.aaf.enabled }}
export KEYSTORE_PASSWORD="${cadi_keystore_password_p12}"
{{- end }}
{{- end }}
/app/start-app.sh
{{- if .Values.global.security.aaf.enabled }}
export KEYSTORE_PASSWORD="${cadi_keystore_password_p12}"
{{- end }}
{{- end }}
/app/start-app.sh
- image: {{ include "
common
.repository" . }}/{{ .Values.image }}
- resources: {{ include "common.resources" . | nindent 1
2
}}
+ image: {{ include "
repositoryGenerator
.repository" . }}/{{ .Values.image }}
+ resources: {{ include "common.resources" . | nindent 1
0
}}
env:
- name: ACTUATOR_USERNAME
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "login") | indent 10 }}
env:
- name: ACTUATOR_USERNAME
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "login") | indent 10 }}
@@
-82,6
+81,7
@@
spec:
mountPath: /app/config
readOnly: true
{{ include "so.helpers.livenessProbe" .| indent 8 }}
mountPath: /app/config
readOnly: true
{{ include "so.helpers.livenessProbe" .| indent 8 }}
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
- name: logs
emptyDir: {}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
- name: logs
emptyDir: {}