XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml b/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
index 7781c53..a17884f 100644
--- a/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
+++ b/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
@@ -23,8 +23,8 @@
restartPolicy: Never
containers:
- name: {{ .Release.Name }}-api-test
- image: {{ .Values.xos_api_testerImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
+ imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
volumeMounts:
- name: log-volume
mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-profiles/rcord-lite/templates/tosca-job.yaml b/xos-profiles/rcord-lite/templates/tosca-job.yaml
index 1405e45..d1a83a2 100644
--- a/xos-profiles/rcord-lite/templates/tosca-job.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-job.yaml
@@ -36,8 +36,8 @@
restartPolicy: OnFailure
containers:
- name: {{ .Chart.Name }}-tosca-loader
- image: {{ tpl .Values.tosca_loaderImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
+ imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}