For non-XOS charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: Icffc569e2c152e0b413f4c7b7d9a546bd9a3ef58
diff --git a/voltha/templates/vcli.yaml b/voltha/templates/vcli.yaml
index 7b962c1..2077705 100644
--- a/voltha/templates/vcli.yaml
+++ b/voltha/templates/vcli.yaml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,8 +49,8 @@
serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
containers:
- name: vcli
- image: {{ .Values.vcliImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.images.vcli.repository }}:{{ tpl .Values.images.vcli.tag . }}
+ imagePullPolicy: {{ .Values.images.vcli.pullPolicy }}
env:
- name: POD_IP
valueFrom:
@@ -60,7 +61,7 @@
fieldRef:
fieldPath: metadata.namespace
args:
-{{ toYaml .Values.vcli_args | indent 12 }}
+{{ toYaml .Values.vcli_args | indent 12 }}
ports:
- containerPort: 22
name: ssh-port