Skip to content

K
k3s
Commit 7bc86d84 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43116 from dchen1107/master

Automatic merge from submit-queue (batch tested with PRs 42828, 43116) Apply taint tolerations for NoExecute for all static pods. Fixed https://github.com/kubernetes/kubernetes/issues/42753 **Release note**: ``` Apply taint tolerations for NoExecute for all static pods. ``` cc/ @davidopp
parents 9497139c d419efbe
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
pkg/kubelet/config/common.go
View file @ 7bc86d84
...@@ -73,6 +73,15 @@ func applyDefaults(pod *api.Pod, source string, isFile bool, nodeName types.Node ...@@ -73,6 +73,15 @@ func applyDefaults(pod *api.Pod, source string, isFile bool, nodeName types.Node
// The generated UID is the hash of the file. // The generated UID is the hash of the file.
pod.Annotations[kubetypes.ConfigHashAnnotationKey] = string(pod.UID) pod.Annotations[kubetypes.ConfigHashAnnotationKey] = string(pod.UID)
if isFile {
// Applying the default Taint tolerations to static pods,
// so they are not evicted when there are node problems.
api.AddOrUpdateTolerationInPod(pod, &api.Toleration{
Operator: "Exists",
Effect: api.TaintEffectNoExecute,
})
}
// Set the default status to pending. // Set the default status to pending.
pod.Status.Phase = api.PodPending pod.Status.Phase = api.PodPending
return nil return nil
......
pkg/kubelet/config/file_linux_test.go
View file @ 7bc86d84
...@@ -208,6 +208,10 @@ func getTestCases(hostname types.NodeName) []*testCase { ...@@ -208,6 +208,10 @@ func getTestCases(hostname types.NodeName) []*testCase {
RestartPolicy: v1.RestartPolicyAlways, RestartPolicy: v1.RestartPolicyAlways,
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,
TerminationGracePeriodSeconds: &grace, TerminationGracePeriodSeconds: &grace,
Tolerations: []v1.Toleration{{
Operator: "Exists",
Effect: "NoExecute",
}},
Containers: []v1.Container{{ Containers: []v1.Container{{
Name: "image", Name: "image",
Image: "test/image", Image: "test/image",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment