XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-services/epc-service/Chart.yaml b/xos-services/epc-service/Chart.yaml
index 47e6af6..fc914fe 100644
--- a/xos-services/epc-service/Chart.yaml
+++ b/xos-services/epc-service/Chart.yaml
@@ -16,4 +16,7 @@
name: epc-service
description: A Helm chart for XOS's "epc-service" service
-version: 1.0.0
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 1.1.1
+appVersion: 1.1.1
diff --git a/xos-services/epc-service/templates/_helpers.tpl b/xos-services/epc-service/templates/_helpers.tpl
index d87ebba..531bb40 100644
--- a/xos-services/epc-service/templates/_helpers.tpl
+++ b/xos-services/epc-service/templates/_helpers.tpl
@@ -62,10 +62,17 @@
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 f6e7203..6b487ba 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: {{ tpl .Values.synchronizerImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-services/epc-service/values.yaml b/xos-services/epc-service/values.yaml
index 1bbf5be..5788f24 100644
--- a/xos-services/epc-service/values.yaml
+++ b/xos-services/epc-service/values.yaml
@@ -22,9 +22,13 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+image:
+ repository: 'xosproject/vepc-synchronizer'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-synchronizerImage: "xosproject/vepc-synchronizer:{{ .Chart.Version }}"
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"