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 "[OOM][DCAE] Chartmuseum deployment support"
[oom.git]
/
kubernetes
/
so
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/templates/deployment.yaml
b/kubernetes/so/templates/deployment.yaml
index
ac335c8
..
2609e99
100755
(executable)
--- a/
kubernetes/so/templates/deployment.yaml
+++ b/
kubernetes/so/templates/deployment.yaml
@@
-44,7
+44,7
@@
spec:
{{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
containers:
- name: {{ include "common.name" . }}
{{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
containers:
- name: {{ include "common.name" . }}
- image: {{ include "
common
.repository" . }}/{{ .Values.image }}
+ image: {{ include "
repositoryGenerator
.repository" . }}/{{ .Values.image }}
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.global.aafEnabled }}
command:
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.global.aafEnabled }}
command:
@@
-52,8
+52,7
@@
spec:
args:
- -c
- |
args:
- -c
- |
- 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 }}
{{- if .Values.global.security.aaf.enabled }}
export KEYSTORE_PASSWORD="${cadi_keystore_password_p12}"
{{- end }}
@@
-92,7
+91,7
@@
spec:
protocol: TCP
# Filebeat sidecar container
- name: {{ include "common.name" . }}-filebeat-onap
protocol: TCP
# Filebeat sidecar container
- name: {{ include "common.name" . }}-filebeat-onap
- image:
"{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image:
{{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-filebeat-conf
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-filebeat-conf
@@
-104,6
+103,7
@@
spec:
mountPath: /var/log/onap/so
- name: {{ include "common.fullname" . }}-logs
mountPath: /var/log/onap
mountPath: /var/log/onap/so
- name: {{ include "common.fullname" . }}-logs
mountPath: /var/log/onap
+ 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: {}