Merge "Fix: anchor pre-stop failures"

This commit is contained in:
Zuul 2019-11-05 17:14:59 +00:00 committed by Gerrit Code Review
commit 890c4ec451
4 changed files with 16 additions and 0 deletions

View File

@ -99,6 +99,8 @@ spec:
mountPath: /tmp/bin
- name: {{ .Values.service.name }}-etc
mountPath: /tmp/etc
- name: pod-tmp
mountPath: /tmp
{{ if $mounts_kubernetes_apiserver.volumeMounts }}{{ toYaml $mounts_kubernetes_apiserver.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: {{ .Values.service.name }}-bin
@ -120,5 +122,7 @@ spec:
configMap:
name: {{ .Values.service.name }}-etc
defaultMode: 0444
- name: pod-tmp
emptyDir: {}
{{ if $mounts_kubernetes_apiserver.volumes }}{{ toYaml $mounts_kubernetes_apiserver.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@ -91,6 +91,8 @@ spec:
mountPath: /host
- name: secret
mountPath: /secret
- name: pod-tmp
mountPath: /tmp
{{ if $mounts_controller_manager.volumeMounts }}{{ toYaml $mounts_controller_manager.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: {{ .Values.service.name }}-bin
@ -108,5 +110,7 @@ spec:
secret:
secretName: {{ .Values.service.name }}
defaultMode: 0444
- name: pod-tmp
emptyDir: {}
{{ if $mounts_controller_manager.volumes }}{{ toYaml $mounts_controller_manager.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@ -127,6 +127,8 @@ spec:
mountPath: /manifests
- name: {{ .Values.service.name }}-etc
mountPath: /anchor-etcd
- name: pod-tmp
mountPath: /tmp
{{ if $mounts_daemonset_anchor.volumeMounts }}{{ toYaml $mounts_daemonset_anchor.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: {{ .Values.service.name }}-bin
@ -161,5 +163,7 @@ spec:
configMap:
name: {{ .Values.service.name }}-etc
defaultMode: 0444
- name: pod-tmp
emptyDir: {}
{{ if $mounts_daemonset_anchor.volumes }}{{ toYaml $mounts_daemonset_anchor.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@ -81,6 +81,8 @@ spec:
mountPath: /host
- name: secret
mountPath: /secret
- name: pod-tmp
mountPath: /tmp
terminationGracePeriodSeconds: {{ .Values.anchor.termination_grace_period }}
volumes:
- name: bin
@ -98,3 +100,5 @@ spec:
secret:
secretName: kubernetes-scheduler
defaultMode: 0444
- name: pod-tmp
emptyDir: {}