XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/rcord-lite/Chart.yaml b/xos-profiles/rcord-lite/Chart.yaml
index 5c4972c..b28c9cd 100644
--- a/xos-profiles/rcord-lite/Chart.yaml
+++ b/xos-profiles/rcord-lite/Chart.yaml
@@ -1,5 +1,4 @@
---
-
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "rcord-lite" profile
name: rcord-lite
-version: 0.1.0
+description: A Helm chart for XOS's "rcord-lite" profile
+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/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 33417bb..8f155de 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -15,23 +15,23 @@
dependencies:
- name: rcord
- version: 1.1.0-dev
+ version: 1.0.4
repository: file://../../xos-services/rcord
- name: onos-service
- version: 2.0.2-dev
+ version: 2.0.5
repository: file://../../xos-services/onos-service
- name: fabric
- version: 2.0.1-dev
+ version: 2.1.3
repository: file://../../xos-services/fabric
- name: volt
- version: 2.0.2-dev
+ version: 2.1.1
repository: file://../../xos-services/volt
- name: vsg-hw
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/vsg-hw
- name: vrouter
- version: 2.0.1-dev
+ version: 2.0.1
repository: file://../../xos-services/vrouter
- name: sadis-server
- version: 1.0.0-dev
+ version: 1.0.1
repository: file://../../sadis-server
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 }}
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 1cb4941..33a1135 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -22,11 +22,19 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+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:2.0.1'
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"