music-tomcat: Use "common.repository" framework 63/72063/1
authorJulien Barbot <julien@barbot.org>
Wed, 7 Nov 2018 11:47:09 +0000 (12:47 +0100)
committerJulien Barbot <julien@barbot.org>
Wed, 7 Nov 2018 11:47:46 +0000 (12:47 +0100)
Change-Id: Ifb19d7d59f8e0d2057174659ac3beb4f0b781d6d
Issue-ID: OOM-874
Signed-off-by: Julien Barbot <julien@barbot.org>
kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml

index 1fec55c..2e04b15 100755 (executable)
@@ -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 }}