Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[CONSUL] Add limits to consul chart.
[oom.git]
/
kubernetes
/
uui
/
templates
/
deployment.yaml
diff --git
a/kubernetes/uui/templates/deployment.yaml
b/kubernetes/uui/templates/deployment.yaml
index
5d564cf
..
d370dfc
100644
(file)
--- a/
kubernetes/uui/templates/deployment.yaml
+++ b/
kubernetes/uui/templates/deployment.yaml
@@
-12,7
+12,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-20,15
+20,18
@@
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:
heritage: {{ .Release.Service }}
spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
replicas: {{ .Values.replicaCount }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
replicas: {{ .Values.replicaCount }}
template:
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" . }}
@@
-37,7
+40,7
@@
spec:
command:
- /bin/bash
- -c
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
+61,7
@@
spec:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
-{{
toYaml (pluck .Values.flavor .Values.resources| first)
| 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 }}