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-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index caeb202..0df5df0 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -15,9 +15,4 @@
name: fabric-crossconnect
description: A Helm chart for XOS's "fabric-crossconnect" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.1.1
-appVersion: 1.1.1
-
-
+version: 1.0.0-dev
diff --git a/xos-services/fabric-crossconnect/templates/deployment.yaml b/xos-services/fabric-crossconnect/templates/deployment.yaml
index 9017f21..e657d34 100644
--- a/xos-services/fabric-crossconnect/templates/deployment.yaml
+++ b/xos-services/fabric-crossconnect/templates/deployment.yaml
@@ -38,8 +38,8 @@
spec:
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ tpl .Values.fabric_crossconnect_synchronizerImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-services/fabric-crossconnect/values.yaml b/xos-services/fabric-crossconnect/values.yaml
index 4994d5a..cac52c3 100644
--- a/xos-services/fabric-crossconnect/values.yaml
+++ b/xos-services/fabric-crossconnect/values.yaml
@@ -22,13 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: 'xosproject/fabric-crossconnect-synchronizer'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
-global:
- registry: ''
+fabric_crossconnect_synchronizerImage: "xosproject/fabric-crossconnect-synchronizer:master"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"