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/rcord/Chart.yaml b/xos-services/rcord/Chart.yaml
index 4e33f42..873db9c 100644
--- a/xos-services/rcord/Chart.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: rcord
 description: A Helm chart for XOS's "rcord" service
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.4
-
-appVersion: 1.0.4
+version: 1.1.0-dev
diff --git a/xos-services/rcord/templates/deployment.yaml b/xos-services/rcord/templates/deployment.yaml
index 83b7720..de345b3 100644
--- a/xos-services/rcord/templates/deployment.yaml
+++ b/xos-services/rcord/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.rcord_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/rcord/values.yaml b/xos-services/rcord/values.yaml
index a6e1155..7d41776 100644
--- a/xos-services/rcord/values.yaml
+++ b/xos-services/rcord/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/rcord-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ""
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"