For non-XOS charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: Icffc569e2c152e0b413f4c7b7d9a546bd9a3ef58
diff --git a/mavenrepo/Chart.yaml b/mavenrepo/Chart.yaml
index c22a136..40351d4 100644
--- a/mavenrepo/Chart.yaml
+++ b/mavenrepo/Chart.yaml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,4 +14,7 @@
# limitations under the License.
name: mavenrepo
+icon: https://guide.opencord.org/logos/cord.svg
version: 1.0.0
+
+appVersion: 'latest'
diff --git a/mavenrepo/templates/deployment.yaml b/mavenrepo/templates/deployment.yaml
index 4de9fb7..a222c06 100644
--- a/mavenrepo/templates/deployment.yaml
+++ b/mavenrepo/templates/deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: mavenrepo
- image: {{ .Values.mavenRepoImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- containerPort: 80
port: 80
diff --git a/mavenrepo/values.yaml b/mavenrepo/values.yaml
index 9dc7975..f5bdd17 100644
--- a/mavenrepo/values.yaml
+++ b/mavenrepo/values.yaml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,13 @@
# helm install mavenrepo -n mavenrepo
-mavenRepoImage: 'opencord/mavenrepo:latest'
-imagePullPolicy: Always
+image:
+ repository: 'opencord/mavenrepo'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
+
+global:
+ registry: ''
nameOverride: ""
fullnameOverride: ""