XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-services/vhss/Chart.yaml b/xos-services/vhss/Chart.yaml
index 6de9a24..efe2c4f 100644
--- a/xos-services/vhss/Chart.yaml
+++ b/xos-services/vhss/Chart.yaml
@@ -15,4 +15,8 @@
name: vhss
description: A Helm chart for XOS's "vhss" service
-version: 1.0.1
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 1.0.2
+appVersion: 1.0.2
+
diff --git a/xos-services/vhss/templates/_helpers.tpl b/xos-services/vhss/templates/_helpers.tpl
index bfee549..04bc6db 100644
--- a/xos-services/vhss/templates/_helpers.tpl
+++ b/xos-services/vhss/templates/_helpers.tpl
@@ -62,11 +62,17 @@
filename: /var/log/xos.log
maxBytes: 10485760
backupCount: 5
+ kafka:
+ class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
+ bootstrap_servers:
+ - "cord-kafka:9092"
+ topic: xos.log.vhss
loggers:
'multistructlog':
handlers:
- console
- file
+ - kafka
level: DEBUG
proxy_ssh:
enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index e697547..81fd874 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/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/vhss/values.yaml b/xos-services/vhss/values.yaml
index e188e13..21a18e4 100644
--- a/xos-services/vhss/values.yaml
+++ b/xos-services/vhss/values.yaml
@@ -22,9 +22,10 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
-
-synchronizerImage: "xosproject/vhss-synchronizer:{{ .Chart.Version }}"
+image:
+ repository: 'xosproject/vhss-synchronizer'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
@@ -40,6 +41,7 @@
global:
proxySshEnabled: true
proxySshUser: "root"
+ registry: ''
resources: {}