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/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
index a20efd4..195b125 100644
--- a/xos-services/vrouter/Chart.yaml
+++ b/xos-services/vrouter/Chart.yaml
@@ -15,7 +15,4 @@
name: vrouter
description: A Helm chart for XOS's "vRouter" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.3
-appVersion: 2.0.3
+version: 2.0.1-dev
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
index 9cfcc8d..f04837e 100644
--- a/xos-services/vrouter/templates/deployment.yaml
+++ b/xos-services/vrouter/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.vrouter_synchronizerImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-services/vrouter/values.yaml b/xos-services/vrouter/values.yaml
index 0bfd1cf..5264a2c 100644
--- a/xos-services/vrouter/values.yaml
+++ b/xos-services/vrouter/values.yaml
@@ -22,14 +22,9 @@
nameOverride: ""
fullnameOverride: ""
+imagePullPolicy: 'Always'
-image:
- repository: 'xosproject/vrouter-synchronizer'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
-
-global:
- registry: ''
+vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:master"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"