Merge "Add support for metal LB in DNS deploy script"
[oom.git] / kubernetes / uui / templates / deployment.yaml
index 6c09924..69f6556 100644 (file)
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       containers:
         - name: {{ include "common.name" . }}
@@ -37,7 +37,7 @@ spec:
           command:
             - /bin/bash
             - -c
-            - /home/uui/tomcat/bin/catalina.sh run
+            - /home/uui/uuiStartup.sh
           ports:
           - containerPort: {{ .Values.service.internalPort }}
           # disable liveness probe when breakpoints set in debugger