Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add support for metal LB in DNS deploy script"
[oom.git]
/
kubernetes
/
uui
/
templates
/
deployment.yaml
diff --git
a/kubernetes/uui/templates/deployment.yaml
b/kubernetes/uui/templates/deployment.yaml
index
4b3ed7c
..
69f6556
100644
(file)
--- a/
kubernetes/uui/templates/deployment.yaml
+++ b/
kubernetes/uui/templates/deployment.yaml
@@
-20,7
+20,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
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 }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@
-28,16
+28,16
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
containers:
- name: {{ include "common.name" . }}
spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{
.Values.global.repository | default .Values.repository
}}/{{ .Values.image }}"
+ image: "{{
include "common.repository" .
}}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /bin/bash
- -c
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
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
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
@@
-58,7
+58,7
@@
spec:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
-{{
toYaml .Values.resources
| indent 12 }}
+{{
include "common.resources" .
| indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}