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/epc-service/Chart.yaml b/xos-services/epc-service/Chart.yaml
index fc914fe..47e6af6 100644
--- a/xos-services/epc-service/Chart.yaml
+++ b/xos-services/epc-service/Chart.yaml
@@ -16,7 +16,4 @@
name: epc-service
description: A Helm chart for XOS's "epc-service" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.1.1
-appVersion: 1.1.1
+version: 1.0.0
diff --git a/xos-services/epc-service/templates/_helpers.tpl b/xos-services/epc-service/templates/_helpers.tpl
index 531bb40..d87ebba 100644
--- a/xos-services/epc-service/templates/_helpers.tpl
+++ b/xos-services/epc-service/templates/_helpers.tpl
@@ -62,17 +62,10 @@
filename: /var/log/xos.log
maxBytes: 10485760
backupCount: 5
- kafka:
- class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
- bootstrap_servers:
- - "cord-kafka:9092"
- topic: xos.log.epc-service
loggers:
'multistructlog':
handlers:
- console
- file
- - kafka
level: DEBUG
-
{{- end -}}
diff --git a/xos-services/epc-service/templates/deployment.yaml b/xos-services/epc-service/templates/deployment.yaml
index 6b487ba..f6e7203 100644
--- a/xos-services/epc-service/templates/deployment.yaml
+++ b/xos-services/epc-service/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/epc-service/values.yaml b/xos-services/epc-service/values.yaml
index 5788f24..1bbf5be 100644
--- a/xos-services/epc-service/values.yaml
+++ b/xos-services/epc-service/values.yaml
@@ -22,13 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: 'xosproject/vepc-synchronizer'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
-global:
- registry: ''
+synchronizerImage: "xosproject/vepc-synchronizer:{{ .Chart.Version }}"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"