Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable PodSecurity admission controller for 1.22 clusters #1456

Merged
merged 1 commit into from
Aug 16, 2021
Merged

Enable PodSecurity admission controller for 1.22 clusters #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion pkg/kubeflags/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var (
"ResourceQuota",
}

defaultAdmissionControllersv118x = []string{
defaultAdmissionControllersv118xv121x = []string{
"NamespaceLifecycle",
"LimitRanger",
"ServiceAccount",
Expand All @@ -81,4 +81,25 @@ var (
"ValidatingAdmissionWebhook",
"ResourceQuota",
}

defaultAdmissionControllersv122x = []string{
"NamespaceLifecycle",
"LimitRanger",
"ServiceAccount",
"TaintNodesByCondition",
"PodSecurity",
"Priority",
"DefaultTolerationSeconds",
"DefaultStorageClass",
"StorageObjectInUseProtection",
"PersistentVolumeClaimResize",
"RuntimeClass",
"CertificateApproval",
"CertificateSigning",
"CertificateSubjectRestriction",
"DefaultIngressClass",
"MutatingAdmissionWebhook",
"ValidatingAdmissionWebhook",
"ResourceQuota",
}
)
11 changes: 7 additions & 4 deletions pkg/kubeflags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ var (
constrainv114x = mustConstraint(">= 1.14.0, < 1.15.0")
constrainv115x = mustConstraint("1.15.x")
constrainv116xv117x = mustConstraint(">= 1.16.0, < 1.18.0")
constrainv118x = mustConstraint("1.18.x")
constrainv118xv121x = mustConstraint(">= 1.18.0, < 1.22.0")
constrainv122x = mustConstraint("1.22.x")
)

// DefaultAdmissionControllers return list of default admission controllers for
Expand All @@ -39,12 +40,14 @@ func DefaultAdmissionControllers(kubeVersion *semver.Version) string {
return strings.Join(defaultAdmissionControllersv115x, ",")
case constrainv116xv117x.Check(kubeVersion):
return strings.Join(defaultAdmissionControllersv116xv117x, ",")
case constrainv118x.Check(kubeVersion):
return strings.Join(defaultAdmissionControllersv118x, ",")
case constrainv118xv121x.Check(kubeVersion):
return strings.Join(defaultAdmissionControllersv118xv121x, ",")
case constrainv122x.Check(kubeVersion):
return strings.Join(defaultAdmissionControllersv122x, ",")
}

// return same as for last known release
return strings.Join(defaultAdmissionControllersv118x, ",")
return strings.Join(defaultAdmissionControllersv122x, ",")
}

func mustConstraint(c string) *semver.Constraints {
Expand Down