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