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