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 "[COMMON][CASSANDRA] Uses new tpls for repos / images"
[oom.git]
/
kubernetes
/
portal
/
components
/
portal-mariadb
/
templates
/
job.yaml
diff --git
a/kubernetes/portal/components/portal-mariadb/templates/job.yaml
b/kubernetes/portal/components/portal-mariadb/templates/job.yaml
index
920ee73
..
5a66bb9
100644
(file)
--- a/
kubernetes/portal/components/portal-mariadb/templates/job.yaml
+++ b/
kubernetes/portal/components/portal-mariadb/templates/job.yaml
@@
-35,7
+35,7
@@
spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image:
"{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image:
{{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@
-50,7
+50,7
@@
spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
- image:
"{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image:
{{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
@@
-63,7
+63,7
@@
spec:
- name: SQL_SRC_DIR
value: {{ .Values.config.sqlSourceDirectory }}
- name: {{ include "common.name" . }}-oom-update-job
- name: SQL_SRC_DIR
value: {{ .Values.config.sqlSourceDirectory }}
- name: {{ include "common.name" . }}-oom-update-job
- image:
"{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image:
{{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST