Merge "Prevent tiller from leaving releases in pending status"
This commit is contained in:
commit
07b4f61c05
@ -153,6 +153,16 @@ spec:
|
|||||||
{{- if .Values.conf.tiller.trace }}
|
{{- if .Values.conf.tiller.trace }}
|
||||||
- -trace
|
- -trace
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
# Delay tiller termination so that it has a chance to finish
|
||||||
|
# deploying releases including marking them with
|
||||||
|
# DEPLOYED/FAILED status, otherwise they can get stuck in
|
||||||
|
# PENDING_*** status.
|
||||||
|
- sleep
|
||||||
|
- "{{ .Values.conf.tiller.prestop_sleep }}"
|
||||||
ports:
|
ports:
|
||||||
- name: tiller
|
- name: tiller
|
||||||
containerPort: {{ .Values.conf.tiller.port }}
|
containerPort: {{ .Values.conf.tiller.port }}
|
||||||
|
@ -209,6 +209,9 @@ conf:
|
|||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
# Limit the maximum number of revisions saved per release. 0 for no limit.
|
# Limit the maximum number of revisions saved per release. 0 for no limit.
|
||||||
history_max: 0
|
history_max: 0
|
||||||
|
# Note: Defaulting to the (default) kubernetes grace period, as anything
|
||||||
|
# greater than that will have no effect.
|
||||||
|
prestop_sleep: 30
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
security_context:
|
security_context:
|
||||||
|
@ -77,6 +77,16 @@ spec:
|
|||||||
{{- if .Values.conf.tiller.trace }}
|
{{- if .Values.conf.tiller.trace }}
|
||||||
- -trace
|
- -trace
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
# Delay tiller termination so that it has a chance to finish
|
||||||
|
# deploying releases including marking them with
|
||||||
|
# DEPLOYED/FAILED status, otherwise they can get stuck in
|
||||||
|
# PENDING_*** status.
|
||||||
|
- sleep
|
||||||
|
- "{{ .Values.conf.tiller.prestop_sleep }}"
|
||||||
ports:
|
ports:
|
||||||
- name: tiller
|
- name: tiller
|
||||||
containerPort: 44134
|
containerPort: 44134
|
||||||
|
@ -41,6 +41,9 @@ conf:
|
|||||||
tiller:
|
tiller:
|
||||||
verbosity: 5
|
verbosity: 5
|
||||||
trace: false
|
trace: false
|
||||||
|
# Note: Defaulting to the (default) kubernetes grace period, as anything
|
||||||
|
# greater than that will have no effect.
|
||||||
|
prestop_sleep: 30
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
resources:
|
resources:
|
||||||
|
Loading…
Reference in New Issue
Block a user