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 "oom tweaks in pap configuration for pdp-x pooling"
[oom.git]
/
kubernetes
/
sdc
/
charts
/
sdc-kb
/
templates
/
deployment.yaml
diff --git
a/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
b/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
index
4501ded
..
f33dbe6
100644
(file)
--- a/
kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
+++ b/
kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
@@
-31,33
+31,33
@@
spec:
release: {{ .Release.Name }}
spec:
initContainers:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-readiness
+ - name: {{ include "common.name" . }}-job-completion
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
command:
command:
- - /root/
ready
.py
+ - /root/
job_complete
.py
args:
args:
- - --
container
-name
- -
"sdc-es"
+ - --
job
-name
+ -
{{ .Release.Name }}-sdc-es-config-elasticsearch
env:
- name: NAMESPACE
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
env:
- name: NAMESPACE
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
containers:
- name: {{ include "common.name" . }}
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 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
- {{if eq .Values.liveness.enabled true }}
+ {{
if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
livenessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
- {{ end
-
}}
+ {{ end }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
@@
-66,12
+66,12
@@
spec:
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
+ - name: NODE_OPTIONS
+ value: {{ .Values.config.nodeOptions }}
- name: HOST_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
- name: HOST_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
- - name: ELASTICSEARCH_URL
- value: "http://{{ .Release.Name }}-{{ index .Values "sdc-es" "service" "name" }}:9200"
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
mountPath: /root/chef-solo/environments/
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
mountPath: /root/chef-solo/environments/
@@
-89,12
+89,12
@@
spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
volumes:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
volumes:
-
- name: {{ include "common.fullname" . }}-localtime
-
hostPath:
-
path: /etc/localtime
-
- name: {{ include "common.fullname" . }}-environments
-
configMap:
-
name: {{ .Release.Name }}-sdc-environments-configmap
-
defaultMode: 0755
+ - name: {{ include "common.fullname" . }}-localtime
+ hostPath:
+ path: /etc/localtime
+ - name: {{ include "common.fullname" . }}-environments
+ configMap:
+ name: {{ .Release.Name }}-sdc-environments-configmap
+ defaultMode: 0755
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file