XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I6dc4bd70fcaf230d019dda871c2d8c4cfb92c7e7
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index e565a0e..1377a99 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -15,4 +15,10 @@
name: kubernetes
description: A Helm chart for XOS's "kubernetes" service
-version: 1.0.1-dev
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 1.0.4
+appVersion: 1.0.4
+
+
+
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index 5c4a96a..83763ca 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -40,8 +40,8 @@
serviceAccountName: kubernetes-synchronizer
containers:
- name: {{ .Chart.Name }}
- image: {{ tpl .Values.kubernetes_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/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index 3b0634b..a1383be 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -22,9 +22,13 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+image:
+ repository: 'xosproject/kubernetes-synchronizer'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:master"
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"