XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-profiles/att-workflow/Chart.yaml b/xos-profiles/att-workflow/Chart.yaml
index 242f5e6..b52fc30 100644
--- a/xos-profiles/att-workflow/Chart.yaml
+++ b/xos-profiles/att-workflow/Chart.yaml
@@ -15,7 +15,11 @@
# limitations under the License.
apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "att-workflow" profile
name: att-workflow
-version: 0.1.0
+description: A Helm chart for XOS's "att-workflow" 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/att-workflow/requirements.yaml b/xos-profiles/att-workflow/requirements.yaml
index 8357af0..8824396 100644
--- a/xos-profiles/att-workflow/requirements.yaml
+++ b/xos-profiles/att-workflow/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: fabric-crossconnect
- version: 1.0.0-dev
+ version: 1.1.1
repository: file://../../xos-services/fabric-crossconnect
- name: att-workflow-driver
- version: 1.0.0-dev
+ version: 1.0.2
repository: file://../../xos-services/att-workflow-driver
- name: sadis-server
- version: 1.0.0-dev
+ version: 1.0.1
repository: file://../../sadis-server
diff --git a/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml b/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml
index 6e93795..f029cf3 100644
--- a/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml
+++ b/xos-profiles/att-workflow/templates/tests/test-att-workflow.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/att-workflow/templates/tosca-job.yaml b/xos-profiles/att-workflow/templates/tosca-job.yaml
index 792a56c..a51aaf7 100644
--- a/xos-profiles/att-workflow/templates/tosca-job.yaml
+++ b/xos-profiles/att-workflow/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/att-workflow/values.yaml b/xos-profiles/att-workflow/values.yaml
index 10dc007..45ee8ab 100644
--- a/xos-profiles/att-workflow/values.yaml
+++ b/xos-profiles/att-workflow/values.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Default values for the rcord-fc profile.
+# Default values for the att-workflow 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"
diff --git a/xos-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index 71e6297..fc26fad 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/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 for XOS's "base-kubernetes" profile
name: base-kubernetes
-version: 0.1.0
+description: A Helm chart for XOS's "base-kubernetes" 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/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index 6d0ea7e..ff2de09 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: kubernetes
- version: 1.0.1-dev
+ version: 1.0.4
repository: file://../../xos-services/kubernetes
diff --git a/xos-profiles/base-kubernetes/templates/tosca-job.yaml b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
index 9502ecc..4578761 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-job.yaml
+++ b/xos-profiles/base-kubernetes/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.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index 8521140..ac6cb1c 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -22,9 +22,14 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'IfNotPresent'
+# tosca loader container
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
index e6003da..3f0f3f0 100644
--- a/xos-profiles/base-openstack/Chart.yaml
+++ b/xos-profiles/base-openstack/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 the "base-openstack" profile
name: base-openstack
+description: A Helm chart for the "base-openstack" profile
+icon: https://guide.opencord.org/logos/cord.svg
version: 0.1.0
+
+# xosproject/tosca-loader version
+appVersion: 1.1.3
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 7f2578a..04cf7dc 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -1,5 +1,4 @@
---
-
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +15,11 @@
dependencies:
- name: onos-service
- version: 2.0.2-dev
+ version: 2.0.5
repository: file://../../xos-services/onos-service
- name: openstack
- version: 1.0.0
+ version: 1.0.2
repository: file://../../xos-services/openstack
- name: vtn-service
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/vtn-service
diff --git a/xos-profiles/base-openstack/templates/tosca-job.yaml b/xos-profiles/base-openstack/templates/tosca-job.yaml
index 0b009e3..48d0b9e 100644
--- a/xos-profiles/base-openstack/templates/tosca-job.yaml
+++ b/xos-profiles/base-openstack/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.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index 11cb5a8..8a9d1c8 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -22,9 +22,14 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+# tosca loader container
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
diff --git a/xos-profiles/demo-exampleservice/Chart.yaml b/xos-profiles/demo-exampleservice/Chart.yaml
index 926af58..2e6dec1 100644
--- a/xos-profiles/demo-exampleservice/Chart.yaml
+++ b/xos-profiles/demo-exampleservice/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,12 @@
# 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 ExampleService. It's assumed that base-kubernetes profile is installed.
name: demo-exampleservice
-version: 0.1.0
+description: A Helm chart that launches and configures ExampleService. 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-exampleservice/requirements.yaml b/xos-profiles/demo-exampleservice/requirements.yaml
index 4da802b..d27a2ef 100644
--- a/xos-profiles/demo-exampleservice/requirements.yaml
+++ b/xos-profiles/demo-exampleservice/requirements.yaml
@@ -15,8 +15,8 @@
dependencies:
- name: exampleservice
- version: 2.1.0
+ version: 2.1.2
repository: file://../../xos-services/exampleservice
- name: addressmanager
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/addressmanager
diff --git a/xos-profiles/demo-exampleservice/templates/tosca-job.yaml b/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
index 0bba3f6..53cce60 100644
--- a/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-exampleservice/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.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/demo-exampleservice/values.yaml b/xos-profiles/demo-exampleservice/values.yaml
index e621e99..496a20f 100644
--- a/xos-profiles/demo-exampleservice/values.yaml
+++ b/xos-profiles/demo-exampleservice/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-exampleservice profile.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
@@ -22,9 +22,10 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'IfNotPresent'
-
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
@@ -39,3 +40,4 @@
global:
proxySshEnabled: true
proxySshUser: root
+ registry: ''
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"
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 5fa482b..e11340b 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/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,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for the "mcord" profile
name: mcord
-version: 0.1.0
+description: A Helm chart for the "mcord" 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/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index 568264f..12b4c93 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -15,32 +15,32 @@
dependencies:
- name: vmme
- version: 1.0.1
+ version: 1.0.2
repository: file://../../xos-services/vmme
- name: vspgwc
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/vspgwc
- name: vspgwu
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/vspgwu
- name: vhss
- version: 1.0.1
+ version: 1.0.2
repository: file://../../xos-services/vhss
- name: hssdb
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/hssdb
- name: internetemulator
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/internetemulator
- name: sdncontroller
- version: 1.0.0
+ version: 1.0.1
repository: file://../../xos-services/sdncontroller
- name: epc-service
- version: 1.0.0
+ version: 1.1.1
repository: file://../../xos-services/epc-service
- name: mcord-subscriber
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/mcord-subscriber
- name: progran
- version: 2.0.0
+ version: 2.0.2
repository: file://../../xos-services/progran
diff --git a/xos-profiles/mcord/templates/tosca-job.yaml b/xos-profiles/mcord/templates/tosca-job.yaml
index f407543..ed6ae54 100644
--- a/xos-profiles/mcord/templates/tosca-job.yaml
+++ b/xos-profiles/mcord/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.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index 380fff8..b6d3a18 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -22,9 +22,10 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'IfNotPresent'
-
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
xosAdminUser: &adminuser "admin@opencord.org"
xosAdminPassword: &adminpass "letmein"
@@ -40,3 +41,4 @@
global:
proxySshEnabled: true
proxySshUser: root
+ registry: ''
diff --git a/xos-profiles/ponsim-pod/Chart.yaml b/xos-profiles/ponsim-pod/Chart.yaml
index 157e299..656e2b4 100644
--- a/xos-profiles/ponsim-pod/Chart.yaml
+++ b/xos-profiles/ponsim-pod/Chart.yaml
@@ -13,8 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for loading the Ponsim pod's TOSCA files into XOS
name: ponsim-pod
-version: 0.1.0
+description: A Helm chart for loading the Ponsim pod's TOSCA files into XOS
+icon: https://guide.opencord.org/logos/xos.svg
+
+version: 1.0.0
+
+# xosproject/tosca-loader version
+appVersion: 1.1.3
diff --git a/xos-profiles/ponsim-pod/templates/tosca-job.yaml b/xos-profiles/ponsim-pod/templates/tosca-job.yaml
index 6099ad3..92d4cd1 100644
--- a/xos-profiles/ponsim-pod/templates/tosca-job.yaml
+++ b/xos-profiles/ponsim-pod/templates/tosca-job.yaml
@@ -37,8 +37,8 @@
restartPolicy: OnFailure
containers:
- name: {{ .Chart.Name }}-ponsim-pod
- image: {{ tpl .Values.tosca_loaderImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/ponsim-pod/values.yaml b/xos-profiles/ponsim-pod/values.yaml
index 981c10f..e6ac302 100644
--- a/xos-profiles/ponsim-pod/values.yaml
+++ b/xos-profiles/ponsim-pod/values.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Default values for the rcord-fc profile.
+# Default values for the ponsim-pod profile.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
@@ -22,9 +22,13 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'IfNotPresent'
+image:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
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"