XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/demo-simpleexampleservice/Chart.yaml b/xos-profiles/demo-simpleexampleservice/Chart.yaml
index 10e3b26..ff04d86 100644
--- a/xos-profiles/demo-simpleexampleservice/Chart.yaml
+++ b/xos-profiles/demo-simpleexampleservice/Chart.yaml
@@ -14,8 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart that launches and configures SimpleExampleService. It's assumed that base-kubernetes profile is installed.
name: demo-simpleexampleservice
-version: 0.1.0
+description: A Helm chart that launches and configures SimpleExampleService. It's assumed that base-kubernetes profile is installed.
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 1.0.0
+
+# xosproject/tosca-loader version
+appVersion: 1.1.3
diff --git a/xos-profiles/demo-simpleexampleservice/requirements.yaml b/xos-profiles/demo-simpleexampleservice/requirements.yaml
index eccfaa9..91ca512 100644
--- a/xos-profiles/demo-simpleexampleservice/requirements.yaml
+++ b/xos-profiles/demo-simpleexampleservice/requirements.yaml
@@ -16,5 +16,5 @@
dependencies:
- name: simpleexampleservice
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/simpleexampleservice
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 }}
diff --git a/xos-profiles/demo-simpleexampleservice/values.yaml b/xos-profiles/demo-simpleexampleservice/values.yaml
index 1927b51..da687b1 100644
--- a/xos-profiles/demo-simpleexampleservice/values.yaml
+++ b/xos-profiles/demo-simpleexampleservice/values.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Default values for the base-openstack profile.
+# Default values for the demo-simpleexampleservice profile.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
@@ -22,11 +22,19 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'IfNotPresent'
+images:
+ tosca_loader:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+ xos_api_tester:
+ repository: 'xosproject/xos-api-tester'
+ tag: 'master'
+ pullPolicy: 'Always'
-xos_api_testerImage: 'xosproject/xos-api-tester:master'
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"