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/addressmanager/Chart.yaml b/xos-services/addressmanager/Chart.yaml
index 2d43e4e..8598325 100644
--- a/xos-services/addressmanager/Chart.yaml
+++ b/xos-services/addressmanager/Chart.yaml
@@ -15,8 +15,4 @@
name: addressmanager
description: A Helm chart for XOS's "addressmanager" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.1
-appVersion: 2.0.1
-
+version: 2.0.0
diff --git a/xos-services/addressmanager/templates/_helpers.tpl b/xos-services/addressmanager/templates/_helpers.tpl
index b85862a..dbf02ef 100644
--- a/xos-services/addressmanager/templates/_helpers.tpl
+++ b/xos-services/addressmanager/templates/_helpers.tpl
@@ -67,16 +67,10 @@
filename: /var/log/xos.log
maxBytes: 10485760
backupCount: 5
- kafka:
- class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
- bootstrap_servers:
- - "cord-kafka:9092"
- topic: xos.log.addressmanager
loggers:
'multistructlog':
handlers:
- console
- file
- - kafka
level: DEBUG
{{- end -}}
diff --git a/xos-services/addressmanager/templates/deployment.yaml b/xos-services/addressmanager/templates/deployment.yaml
index 61f1900..7610ca4 100644
--- a/xos-services/addressmanager/templates/deployment.yaml
+++ b/xos-services/addressmanager/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.addressmanager_synchronizerImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-services/addressmanager/values.yaml b/xos-services/addressmanager/values.yaml
index cc9b4e6..eb570da 100644
--- a/xos-services/addressmanager/values.yaml
+++ b/xos-services/addressmanager/values.yaml
@@ -22,13 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: 'xosproject/addressmanager-synchronizer'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
-global:
- registry: ''
+addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:{{ .Chart.Version }}"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"