XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index de60496..85981f0 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -16,4 +16,8 @@
name: fabric
description: A Helm chart for XOS's "fabric" service
-version: 2.0.1-dev
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 2.1.3
+appVersion: 2.1.3
+
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index 031abc1..6c666b8 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -39,8 +39,8 @@
spec:
containers:
- name: {{ .Chart.Name }}
- image: {{ tpl .Values.fabric_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/values.yaml b/xos-services/fabric/values.yaml
index 2f6122c..de47cc9 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -22,9 +22,13 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+image:
+ repository: xosproject/fabric-synchronizer
+ tag: "{{ .Chart.AppVersion }}"
+ pullPolicy: Always
-fabric_synchronizerImage: "xosproject/fabric-synchronizer:master"
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"