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/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 2c49deb..5fa482b 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: mcord
+apiVersion: v1
+appVersion: "1.0"
description: A Helm chart for the "mcord" profile
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
+name: mcord
+version: 0.1.0
diff --git a/xos-profiles/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index 12b4c93..568264f 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -15,32 +15,32 @@
dependencies:
- name: vmme
- version: 1.0.2
+ version: 1.0.1
repository: file://../../xos-services/vmme
- name: vspgwc
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/vspgwc
- name: vspgwu
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/vspgwu
- name: vhss
- version: 1.0.2
+ version: 1.0.1
repository: file://../../xos-services/vhss
- name: hssdb
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/hssdb
- name: internetemulator
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/internetemulator
- name: sdncontroller
- version: 1.0.1
+ version: 1.0.0
repository: file://../../xos-services/sdncontroller
- name: epc-service
- version: 1.1.1
+ version: 1.0.0
repository: file://../../xos-services/epc-service
- name: mcord-subscriber
- version: 2.0.1
+ version: 2.0.0
repository: file://../../xos-services/mcord-subscriber
- name: progran
- version: 2.0.2
+ version: 2.0.0
repository: file://../../xos-services/progran
diff --git a/xos-profiles/mcord/templates/tosca-job.yaml b/xos-profiles/mcord/templates/tosca-job.yaml
index ed6ae54..f407543 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: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ tpl .Values.tosca_loaderImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index b6d3a18..380fff8 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -22,10 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: 'xosproject/tosca-loader'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
+
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
xosAdminUser: &adminuser "admin@opencord.org"
xosAdminPassword: &adminpass "letmein"
@@ -41,4 +40,3 @@
global:
proxySshEnabled: true
proxySshUser: root
- registry: ''