Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Fix resources indent
[oom.git]
/
kubernetes
/
so
/
components
/
so-catalog-db-adapter
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
b/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
index
0aac5f4
..
b05e87e
100755
(executable)
--- a/
kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
+++ b/
kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
@@
-44,16
+44,15
@@
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 }}
- resources: {{ include "common.resources" . | nindent 1
2
}}
+ image: {{ include "
repositoryGenerator
.repository" . }}/{{ .Values.image }}
+ resources: {{ include "common.resources" . | nindent 1
0
}}
{{- if .Values.global.aafEnabled }}
command:
- sh
args:
- -c
- |
{{- if .Values.global.aafEnabled }}
command:
- sh
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 }}
@@
-86,8
+85,9
@@
spec:
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}
{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
protocol: TCP
+ 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: {}