Merge "Fix the nginx config"

[oom.git] / kubernetes / common / music / charts / music-tomcat / templates / deployment.yaml

diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 1fec55c..2a38a6a 100755 (executable)
--- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - zookeeper 
+        - zookeeper
         env:
         - name: NAMESPACE
           valueFrom:
@@ -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 }}
@@ -101,7 +101,7 @@ spec:
             mountPath: /opt/app/music/etc/music.properties
             subPath: music.properties
           resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 12 }}
       volumes:
         - name: shared-data
           emptyDir: {}