aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <adetalhouet89@gmail.com>2018-11-07 14:13:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-07 14:13:19 +0000
commit76d02071f00c04937e34905e93084f5ea1816cc1 (patch)
tree7c7a30b23785c83ad836af2a601776018e74f237
parentbf97fd81c2c7d3eefd9ce48d2d60c5b720cae086 (diff)
parentb314f9cc6f5a1f39e1f96cb406f788b1cc451efe (diff)
Merge "music-tomcat: Use "common.repository" framework"
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/templates/deployment.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 1fec55caca..2e04b15561 100755
--- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
fieldPath: metadata.namespace
# War Container
- name: "{{ .Chart.Name }}-war"
- image: "{{ .Values.repository }}/{{ .Values.warImage }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.warImage }}"
command: ["cp","/app/MUSIC.war","/webapps"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
@@ -73,7 +73,7 @@ spec:
containers:
# Tomcat Container
- name: "{{ include "common.name" . }}"
- image: "{{ .Values.repository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}