commit | d9d6b356a0b8e0605effe5e0c9e6d87d5bf104bd | [log] [tgz] |
---|---|---|
author | Zack Williams <zdw@opennetworking.org> | Fri Oct 05 07:53:30 2018 -0700 |
committer | Zack Williams <zdw@opennetworking.org> | Wed Oct 10 11:58:33 2018 -0700 |
tree | 98438317e611f160ef38dacbe13edcd3c0e72793 | |
parent | c7aa889b64457d15edcd831e7314436a9f2e9462 [diff] |
XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/demo-simpleexampleservice/templates/tests/test-demo-simpleexampleservice.yaml b/xos-profiles/demo-simpleexampleservice/templates/tests/test-demo-simpleexampleservice.yaml index 46f0d2d..bfdcfb3 100644 --- a/xos-profiles/demo-simpleexampleservice/templates/tests/test-demo-simpleexampleservice.yaml +++ b/xos-profiles/demo-simpleexampleservice/templates/tests/test-demo-simpleexampleservice.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/demo-simpleexampleservice/templates/tosca-job.yaml b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml index 0a05d11..210e44f 100644 --- a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml +++ b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
@@ -35,8 +35,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 }}