kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4299 from blakebarnett/bdb/k8s_1-9_default_admission_controllers 

Update list of AdmissionControllers for k8s 1.9
This commit is contained in:
k8s-ci-robot 2018-01-19 12:00:28 -08:00 committed by GitHub
parent e271f9edfb e37be9a88c
commit 7f67d33db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/components/apiserver.go
View File

@ -174,7 +174,7 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
"ResourceQuota", "ResourceQuota",
} }
} }
if b.IsKubernetesGTE("1.7") && b.IsKubernetesLT("1.8") { if b.IsKubernetesGTE("1.7") && b.IsKubernetesLT("1.9") {
c.AdmissionControl = []string{ c.AdmissionControl = []string{
"Initializers", "Initializers",
"NamespaceLifecycle", "NamespaceLifecycle",
@ -187,7 +187,9 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
"ResourceQuota", "ResourceQuota",
} }
} }
if b.IsKubernetesGTE("1.8") { // Based on recommendations from:
// https://kubernetes.io/docs/admin/admission-controllers/#is-there-a-recommended-set-of-admission-controllers-to-use
if b.IsKubernetesGTE("1.9") {
c.AdmissionControl = []string{ c.AdmissionControl = []string{
"Initializers", "Initializers",
"NamespaceLifecycle", "NamespaceLifecycle",
@ -196,8 +198,9 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
"PersistentVolumeLabel", "PersistentVolumeLabel",
"DefaultStorageClass", "DefaultStorageClass",
"DefaultTolerationSeconds", "DefaultTolerationSeconds",
"MutatingAdmissionWebhook",
"ValidatingAdmissionWebhook",
"NodeRestriction", "NodeRestriction",
"Priority",
"ResourceQuota", "ResourceQuota",
} }
} }