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/progran/Chart.yaml b/xos-services/progran/Chart.yaml
index ddf1ad2..0d386c3 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: progran
 description: A Helm chart for XOS's "progran" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.2
-appVersion: 2.0.2
+version: 2.0.0
diff --git a/xos-services/progran/templates/_helpers.tpl b/xos-services/progran/templates/_helpers.tpl
index 8c2404d..1ee8fa4 100644
--- a/xos-services/progran/templates/_helpers.tpl
+++ b/xos-services/progran/templates/_helpers.tpl
@@ -62,16 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.progran
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index e8600cc..7671550 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/progran/values.yaml b/xos-services/progran/values.yaml
index c300941..e26b6fa 100644
--- a/xos-services/progran/values.yaml
+++ b/xos-services/progran/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/progran-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+synchronizerImage: "xosproject/progran-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"