Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove comparison of kubelet_shutdown_grace_period and kubelet_shutdown_grace_period_critical_pods #7993

Merged
merged 1 commit into from
Sep 22, 2021
Merged

Remove comparison of kubelet_shutdown_grace_period and kubelet_shutdown_grace_period_critical_pods #7993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ kube_proxy_nodeport_addresses: >-
kube_encrypt_secret_data: false

# Graceful Node Shutdown (Kubernetes >= 1.21.0), see https://kubernetes.io/blog/2021/04/21/graceful-node-shutdown-beta/
# kubelet_shutdown_grace_period had to be greater than kubelet_shutdown_grace_period_critical_pods to allow
# non-critical podsa to also terminate gracefully
# kubelet_shutdown_grace_period: 60s
# kubelet_shutdown_grace_period_critical_pods: 20s

Expand Down
7 changes: 0 additions & 7 deletions roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,6 @@
- not ignore_assert_errors
- inventory_hostname in groups['kube_node']

- name: Stop when ShutdownGracePeriod less than ShutdownGracePeriodCriticalPods
assert:
that: kubelet_shutdown_grace_period > kubelet_shutdown_grace_period_critical_pods
msg: "ShutdownGracePeriod ({{ kubelet_shutdown_grace_period }}) needs to be greater than ShutdownGracePeriodCriticalPods ({{ kubelet_shutdown_grace_period_critical_pods }}) in order to give normal pods time to be evacuated, please see https://kubernetes.io/blog/2021/04/21/graceful-node-shutdown-beta/ for details"
when:
- kube_version is version('v1.21.0', '>=')

- name: Stop when dynamic_kubelet_configuration enabled for kubernetes >= 1.22
assert:
that: not dynamic_kubelet_configuration
Expand Down