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/att-workflow/Chart.yaml b/xos-profiles/att-workflow/Chart.yaml
index e42858f..242f5e6 100644
--- a/xos-profiles/att-workflow/Chart.yaml
+++ b/xos-profiles/att-workflow/Chart.yaml
@@ -15,11 +15,7 @@
# limitations under the License.
apiVersion: v1
-name: att-workflow
+appVersion: "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.0
-
+name: att-workflow
+version: 0.1.0
diff --git a/xos-profiles/att-workflow/requirements.yaml b/xos-profiles/att-workflow/requirements.yaml
index 8824396..8357af0 100644
--- a/xos-profiles/att-workflow/requirements.yaml
+++ b/xos-profiles/att-workflow/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: fabric-crossconnect
- version: 1.1.1
+ version: 1.0.0-dev
repository: file://../../xos-services/fabric-crossconnect
- name: att-workflow-driver
- version: 1.0.2
+ version: 1.0.0-dev
repository: file://../../xos-services/att-workflow-driver
- name: sadis-server
- version: 1.0.1
+ version: 1.0.0-dev
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 f029cf3..6e93795 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.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/att-workflow/templates/tosca-job.yaml b/xos-profiles/att-workflow/templates/tosca-job.yaml
index a51aaf7..792a56c 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: {{ .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/att-workflow/values.yaml b/xos-profiles/att-workflow/values.yaml
index 8ab7539..10dc007 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 att-workflow profile.
+# Default values for the rcord-fc profile.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
@@ -22,19 +22,11 @@
nameOverride: ""
fullnameOverride: ""
-images:
- tosca_loader:
- repository: 'xosproject/tosca-loader'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
- 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:master'
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"