XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index 248ffbf..8c92ab6 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -15,4 +15,5 @@
description: A Helm chart for XOS's "onos-service" service, which configures ONOS
name: onos-service
-version: 2.0.2-dev
+version: 2.0.5
+appVersion: 2.0.5
diff --git a/xos-services/onos-service/templates/deployment.yaml b/xos-services/onos-service/templates/deployment.yaml
index 967d501..0398ee0 100644
--- a/xos-services/onos-service/templates/deployment.yaml
+++ b/xos-services/onos-service/templates/deployment.yaml
@@ -38,8 +38,8 @@
spec:
containers:
- name: {{ .Chart.Name }}
- image: {{ tpl .Values.onos_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/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index ab52be0..21c4bbe 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -22,9 +22,13 @@
nameOverride: ""
fullnameOverride: ""
-imagePullPolicy: 'Always'
+image:
+ repository: 'xosproject/onos-synchronizer'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
-onos_synchronizerImage: "xosproject/onos-synchronizer:master"
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"