Skip to content
This repository has been archived by the owner on Jun 13, 2023. It is now read-only.

kube-apiserver: remove deprecated admission control flag #135

Merged
merged 1 commit into from
Aug 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/templates/1.10.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/templates/1.11.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/templates/1.12.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/templates/1.13.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/templates/1.14.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down