Revert "XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy"
This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.
Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/xos-profiles/rcord-lite/Chart.yaml b/xos-profiles/rcord-lite/Chart.yaml
index 88b7ab4..5c4972c 100644
--- a/xos-profiles/rcord-lite/Chart.yaml
+++ b/xos-profiles/rcord-lite/Chart.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,10 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: rcord-lite
+apiVersion: v1
+appVersion: "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.0
+name: rcord-lite
+version: 0.1.0
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index f1398ee..33417bb 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -15,23 +15,23 @@
dependencies:
- name: rcord
- version: 1.0.4
+ version: 1.1.0-dev
repository: file://../../xos-services/rcord
- name: onos-service
- version: 2.0.5
+ version: 2.0.2-dev
repository: file://../../xos-services/onos-service
- name: fabric
- version: 2.1.3
+ version: 2.0.1-dev
repository: file://../../xos-services/fabric
- name: volt
- version: 2.1.1
+ version: 2.0.2-dev
repository: file://../../xos-services/volt
- name: vsg-hw
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/vsg-hw
- name: vrouter
- version: 2.0.3
+ version: 2.0.1-dev
repository: file://../../xos-services/vrouter
- name: sadis-server
- version: 1.0.1
+ version: 1.0.0-dev
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 a17884f..7781c53 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.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
- imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+ image: {{ .Values.xos_api_testerImage }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
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 d1a83a2..1405e45 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: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
- imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
+ image: {{ tpl .Values.tosca_loaderImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 65e3396..1cb4941 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -22,19 +22,11 @@
nameOverride: ""
fullnameOverride: ""
-images:
- tosca_loader:
- repository: 'xosproject/tosca-loader'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
- xos_api_tester:
- repository: 'xosproject/xos-api-tester'
- tag: '2.0.3'
- pullPolicy: 'Always'
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
-global:
- registry: ''
+xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"