Merge pull request #63684 from timothysc/priority

Automatic merge from submit-queue (batch tested with PRs 63673, 63712, 63691, 63684). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add 'system-cluster-critical' to kubeadm control plane pods. **What this PR does / why we need it**: Add 'system-cluster-critical' to kubeadm control plane pods. **Which issue(s) this PR fixes**: Fixes https://github.com/kubernetes/kubeadm/issues/395 **Special notes for your reviewer**: **Release note**: ``` NONE ``` /cc @kubernetes/sig-cluster-lifecycle-pr-reviews

Merge pull request #63684 from timothysc/priority
5133d19f · Kubernetes Submit Queue · GitHub · fc28923e · 465094f3 · 5133d19f
Unverified Commit 5133d19f authored May 11, 2018 by Kubernetes Submit Queue Committed by GitHub May 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

utils.go cmd/kubeadm/app/util/staticpod/utils.go +4 -3

utils_test.go cmd/kubeadm/app/util/staticpod/utils_test.go +3 -2

No files found.
--- a/cmd/kubeadm/app/util/staticpod/utils.go
+++ b/cmd/kubeadm/app/util/staticpod/utils.go
@@ -64,9 +64,10 @@ func ComponentPod(container v1.Container, volumes map[string]v1.Volume) v1.Pod {
 			Labels: map[string]string{"component": container.Name, "tier": "control-plane"},
 		},
 		Spec: v1.PodSpec{
-			Containers:  []v1.Container{container},
+			Containers:        []v1.Container{container},
-			HostNetwork: true,
+			PriorityClassName: "system-cluster-critical",
-			Volumes:     VolumeMapToSlice(volumes),
+			HostNetwork:       true,
+			Volumes:           VolumeMapToSlice(volumes),
 		},
 	}
 }

--- a/cmd/kubeadm/app/util/staticpod/utils_test.go
+++ b/cmd/kubeadm/app/util/staticpod/utils_test.go
@@ -286,8 +286,9 @@ func TestComponentPod(t *testing.T) {
 							Name: "foo",
 						},
 					},
-					HostNetwork: true,
+					PriorityClassName: "system-cluster-critical",
-					Volumes:     []v1.Volume{},
+					HostNetwork:       true,
+					Volumes:           []v1.Volume{},
 				},
 			},
 		},