From 3d2ed84f89a8e598e79b5ec5adceab7b96eac4a8 Mon Sep 17 00:00:00 2001 From: Julien Balestra Date: Thu, 22 Aug 2019 16:41:42 +0200 Subject: [PATCH] kube-apiserver: remove deprecated admission control flag --- LICENSE-3rdparty.csv | 2 ++ pkg/setup/templates/1.10.go | 2 +- pkg/setup/templates/1.11.go | 2 +- pkg/setup/templates/1.12.go | 2 +- pkg/setup/templates/1.13.go | 2 +- pkg/setup/templates/1.14.go | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 7f144c9..8f50682 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -10,6 +10,7 @@ core,"github.com/coreos/go-systemd/unit",Apache-2.0 core,"github.com/coreos/go-systemd/util",Apache-2.0 core,"github.com/coreos/pkg/dlopen",Apache-2.0 core,"github.com/cpuguy83/go-md2man/md2man",MIT +core,"github.com/davecgh/go-spew/spew",ISC core,"github.com/docker/distribution/digest",Apache-2.0 core,"github.com/docker/distribution/reference",Apache-2.0 core,"github.com/docker/docker/api/types",Apache-2.0 @@ -71,6 +72,7 @@ core,"github.com/hashicorp/vault/helper/compressutil",MPL-2.0 core,"github.com/hashicorp/vault/helper/jsonutil",MPL-2.0 core,"github.com/hashicorp/vault/helper/parseutil",MPL-2.0 core,"github.com/hashicorp/vault/helper/strutil",MPL-2.0 +core,"github.com/howeyc/gopass",ISC core,"github.com/imdario/mergo",NewBSD core,"github.com/inconshreveable/mousetrap",Apache-2.0 core,"github.com/json-iterator/go",MIT diff --git a/pkg/setup/templates/1.10.go b/pkg/setup/templates/1.10.go index feeebd9..323c93f 100644 --- a/pkg/setup/templates/1.10.go +++ b/pkg/setup/templates/1.10.go @@ -80,7 +80,7 @@ ExecStart={{.RootABSPath}}/bin/hyperkube apiserver \ --insecure-port=8080 \ --allow-privileged=true \ --service-cluster-ip-range={{ .ServiceClusterIPRange }} \ - --admission-control=NamespaceLifecycle,PodPreset,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,EventRateLimit \ + --enable-admission-plugins=PodPreset,NodeRestriction,EventRateLimit,PodTolerationRestriction \ --kubelet-preferred-address-types=InternalIP,LegacyHostIP,ExternalDNS,InternalDNS,Hostname \ --authorization-mode=RBAC \ --etcd-servers=http://127.0.0.1:2379 \ diff --git a/pkg/setup/templates/1.11.go b/pkg/setup/templates/1.11.go index 198fe89..7cd7e3c 100644 --- a/pkg/setup/templates/1.11.go +++ b/pkg/setup/templates/1.11.go @@ -80,7 +80,7 @@ ExecStart={{.RootABSPath}}/bin/hyperkube apiserver \ --insecure-port=8080 \ --allow-privileged=true \ --service-cluster-ip-range={{ .ServiceClusterIPRange }} \ - --admission-control=NamespaceLifecycle,PodPreset,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,EventRateLimit \ + --enable-admission-plugins=PodPreset,NodeRestriction,EventRateLimit,PodTolerationRestriction \ --kubelet-preferred-address-types=InternalIP,LegacyHostIP,ExternalDNS,InternalDNS,Hostname \ --authorization-mode=RBAC \ --etcd-servers=http://127.0.0.1:2379 \ diff --git a/pkg/setup/templates/1.12.go b/pkg/setup/templates/1.12.go index 9fe341c..f77aaa7 100644 --- a/pkg/setup/templates/1.12.go +++ b/pkg/setup/templates/1.12.go @@ -79,7 +79,7 @@ ExecStart={{.RootABSPath}}/bin/hyperkube apiserver \ --insecure-port=8080 \ --allow-privileged=true \ --service-cluster-ip-range={{ .ServiceClusterIPRange }} \ - --admission-control=NamespaceLifecycle,PodPreset,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,EventRateLimit \ + --enable-admission-plugins=PodPreset,NodeRestriction,EventRateLimit,PodTolerationRestriction \ --kubelet-preferred-address-types=InternalIP,LegacyHostIP,ExternalDNS,InternalDNS,Hostname \ --authorization-mode=RBAC \ --etcd-servers=http://127.0.0.1:2379 \ diff --git a/pkg/setup/templates/1.13.go b/pkg/setup/templates/1.13.go index daa825c..d457bd8 100644 --- a/pkg/setup/templates/1.13.go +++ b/pkg/setup/templates/1.13.go @@ -78,7 +78,7 @@ ExecStart={{.RootABSPath}}/bin/hyperkube apiserver \ --insecure-port=8080 \ --allow-privileged=true \ --service-cluster-ip-range={{ .ServiceClusterIPRange }} \ - --admission-control=NamespaceLifecycle,PodPreset,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,EventRateLimit \ + --enable-admission-plugins=PodPreset,NodeRestriction,EventRateLimit,PodTolerationRestriction \ --kubelet-preferred-address-types=InternalIP,LegacyHostIP,ExternalDNS,InternalDNS,Hostname \ --authorization-mode=RBAC \ --etcd-servers=http://127.0.0.1:2379 \ diff --git a/pkg/setup/templates/1.14.go b/pkg/setup/templates/1.14.go index aad8906..e66c043 100644 --- a/pkg/setup/templates/1.14.go +++ b/pkg/setup/templates/1.14.go @@ -78,7 +78,7 @@ ExecStart={{.RootABSPath}}/bin/hyperkube apiserver \ --insecure-port=8080 \ --allow-privileged=true \ --service-cluster-ip-range={{ .ServiceClusterIPRange }} \ - --admission-control=NamespaceLifecycle,PodPreset,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,EventRateLimit \ + --enable-admission-plugins=PodPreset,NodeRestriction,EventRateLimit,PodTolerationRestriction \ --kubelet-preferred-address-types=InternalIP,LegacyHostIP,ExternalDNS,InternalDNS,Hostname \ --authorization-mode=RBAC \ --etcd-servers=http://127.0.0.1:2379 \