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 "update release version of modeling-etsicatalog"
[oom.git]
/
kubernetes
/
oof
/
charts
/
oof-cmso
/
charts
/
oof-cmso-service
/
templates
/
deployment.yaml
diff --git
a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
index
e7b5eed
..
b41b840
100644
(file)
--- a/
kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
+++ b/
kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
@@
-35,7
+35,7
@@
spec:
- /root/ready.py
args:
- --container-name
- /root/ready.py
args:
- --container-name
- - {{ .Values.
mariadb.nameOverride
}}
+ - {{ .Values.
config.db.container
}}
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-50,18
+50,15
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
- value: {{ .Values.config.db
_
host }}.{{.Release.Namespace}}
+ value: {{ .Values.config.db
.
host }}.{{.Release.Namespace}}
- name: DB_PORT
- name: DB_PORT
- value: {{ .Values.config.db
_
port | quote}}
+ value: {{ .Values.config.db
.
port | quote}}
- name: DB_USERNAME
- name: DB_USERNAME
- value: {{ .Values.config.db
_
root }}
+ value: {{ .Values.config.db
.
root }}
- name: DB_SCHEMA
- name: DB_SCHEMA
- value: {{ .Values.config.mysqlDatabase }}
+ value: {{ .Values.config.
db.
mysqlDatabase }}
- name: DB_PASSWORD
- name: DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: db-root-password
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-root-password" "key" "password") | indent 10}}
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
@@
-90,7
+87,7
@@
spec:
- name: {{ include "common.fullname" . }}-config
mountPath: /share/etc/config
ports:
- name: {{ include "common.fullname" . }}-config
mountPath: /share/etc/config
ports:
- - containerPort: 5000
+ - containerPort: 5000
resources:
{{ include "common.resources" . }}
- name: {{ include "common.name" . }}
resources:
{{ include "common.resources" . }}
- name: {{ include "common.name" . }}
@@
-98,18
+95,15
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
- value: {{ .Values.config.db
_
host }}.{{.Release.Namespace}}
+ value: {{ .Values.config.db
.
host }}.{{.Release.Namespace}}
- name: DB_PORT
- name: DB_PORT
- value: {{ .Values.config.db
_
port | quote}}
+ value: {{ .Values.config.db
.
port | quote}}
- name: DB_USERNAME
- name: DB_USERNAME
-
value: {{ .Values.config.db_user
}}
+
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "login") | indent 10
}}
- name: DB_SCHEMA
- name: DB_SCHEMA
- value: {{ .Values.config.mysqlDatabase }}
+ value: {{ .Values.config.
db.
mysqlDatabase }}
- name: DB_PASSWORD
- name: DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: user-password
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "password") | indent 10}}
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE