Skip to content

Commit 552d2b3

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#55237 from andrewsykim/kubeadm-remove-priority-admission
Automatic merge from submit-queue (batch tested with PRs 53273, 55058, 55237, 50140). 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>. kubeadm: remove priority admission controller for v1.9 **What this PR does / why we need it**: Removes Priority Admission Controller in kubeadm since it's currently in alpha. **Release note**: ```release-note Removes Priority Admission Controller from kubeadm since it's alpha. ``` cc @luxas
2 parents 26986e8 + 7be4926 commit 552d2b3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cmd/kubeadm/app/phases/controlplane/manifests.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ const (
4141
DefaultCloudConfigPath = "/etc/kubernetes/cloud-config"
4242

4343
defaultV18AdmissionControl = "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota"
44-
deprecatedV19AdmissionControl = "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota"
45-
defaultV19AdmissionControl = "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota"
44+
deprecatedV19AdmissionControl = "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota"
45+
defaultV19AdmissionControl = "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota"
4646
)
4747

4848
// CreateInitStaticPodManifestFiles will write all static pod manifest files needed to bring up the control plane.

cmd/kubeadm/app/phases/controlplane/manifests_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func TestGetAPIServerCommand(t *testing.T) {
362362
expected: []string{
363363
"kube-apiserver",
364364
"--insecure-port=0",
365-
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota",
365+
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota",
366366
"--service-cluster-ip-range=bar",
367367
"--service-account-key-file=" + testCertsDir + "/sa.pub",
368368
"--client-ca-file=" + testCertsDir + "/ca.crt",
@@ -399,7 +399,7 @@ func TestGetAPIServerCommand(t *testing.T) {
399399
expected: []string{
400400
"kube-apiserver",
401401
"--insecure-port=0",
402-
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota",
402+
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota",
403403
"--service-cluster-ip-range=bar",
404404
"--service-account-key-file=" + testCertsDir + "/sa.pub",
405405
"--client-ca-file=" + testCertsDir + "/ca.crt",
@@ -435,7 +435,7 @@ func TestGetAPIServerCommand(t *testing.T) {
435435
expected: []string{
436436
"kube-apiserver",
437437
"--insecure-port=0",
438-
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota",
438+
"--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota",
439439
"--service-cluster-ip-range=bar",
440440
"--service-account-key-file=" + testCertsDir + "/sa.pub",
441441
"--client-ca-file=" + testCertsDir + "/ca.crt",

0 commit comments

Comments
 (0)