Merge "Fixed for hyperkube 1.12"
This commit is contained in:
commit
814ffa2a71
|
@ -54,6 +54,9 @@ spec:
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
operator: Exists
|
operator: Exists
|
||||||
|
- key: node.kubernetes.io/not-ready
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.daemonset_anchor.timeout }}
|
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.daemonset_anchor.timeout }}
|
||||||
containers:
|
containers:
|
||||||
- name: etcdctl
|
- name: etcdctl
|
||||||
|
|
|
@ -52,6 +52,9 @@ spec:
|
||||||
- key: node.kubernetes.io/network-unavailable
|
- key: node.kubernetes.io/network-unavailable
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
operator: Exists
|
operator: Exists
|
||||||
|
- key: node.kubernetes.io/not-ready
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
containers:
|
containers:
|
||||||
- name: "{{ .Release.Name }}-etcd-test"
|
- name: "{{ .Release.Name }}-etcd-test"
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -46,6 +46,9 @@ spec:
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
operator: Exists
|
operator: Exists
|
||||||
|
- key: node.kubernetes.io/not-ready
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
containers:
|
containers:
|
||||||
- name: proxy
|
- name: proxy
|
||||||
image: {{ .Values.images.tags.proxy }}
|
image: {{ .Values.images.tags.proxy }}
|
||||||
|
|
Loading…
Reference in New Issue