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 "[DCAEMOD] Uses new tpls for repos / images"
[oom.git]
/
kubernetes
/
so
/
components
/
so-monitoring
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/components/so-monitoring/templates/deployment.yaml
b/kubernetes/so/components/so-monitoring/templates/deployment.yaml
index
7875893
..
dc80d42
100644
(file)
--- a/
kubernetes/so/components/so-monitoring/templates/deployment.yaml
+++ b/
kubernetes/so/components/so-monitoring/templates/deployment.yaml
@@
-47,7
+47,7
@@
spec:
spec:
initContainers: {{ include "so.certificate.container_importer" . | nindent 6 }}
- name: so-chown
spec:
initContainers: {{ include "so.certificate.container_importer" . | nindent 6 }}
- name: so-chown
- image:
alpine:3.6
+ image:
{{ include "repositoryGenerator.image.busybox" . }}
volumeMounts:
- name: logs
mountPath: /app/logs
volumeMounts:
- name: logs
mountPath: /app/logs
@@
-56,7
+56,7
@@
spec:
restartPolicy: Always
containers:
- name: {{ include "common.name" . }}
restartPolicy: Always
containers:
- name: {{ include "common.name" . }}
- image: {{ include "
common
.repository" . }}/{{ .Values.image }}
+ image: {{ include "
repositoryGenerator
.repository" . }}/{{ .Values.image }}
resources: {{ include "common.resources" . | nindent 12 }}
command:
- /bin/sh
resources: {{ include "common.resources" . | nindent 12 }}
command:
- /bin/sh
@@
-75,15
+75,9
@@
spec:
/app/start-app.sh
env:
- name: DB_HOST
/app/start-app.sh
env:
- name: DB_HOST
- valueFrom:
- secretKeyRef:
- name: {{ include "common.release" . }}-so-db-secrets
- key: mariadb.readwrite.host
+ value: {{ include "common.mariadbService" . }}
- name: DB_PORT
- name: DB_PORT
- valueFrom:
- secretKeyRef:
- name: {{ include "common.release" . }}-so-db-secrets
- key: mariadb.readwrite.port
+ value: {{ include "common.mariadbPort" . | quote }}
- name: DB_USERNAME
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-user-creds" "key" "login") | indent 10 }}
- name: DB_PASSWORD
- name: DB_USERNAME
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-user-creds" "key" "login") | indent 10 }}
- name: DB_PASSWORD