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

Jump to bottom

Remove PodSecurityPolicy admission plugin #109798

Merged
merged 3 commits into from May 5, 2022
Merged

Remove PodSecurityPolicy admission plugin #109798

merged 3 commits into from May 5, 2022

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented May 4, 2022 •
edited

What type of PR is this?

/kind cleanup
/kind deprecation

What this PR does / why we need it:

Removes the PodSecurityPolicy admission plugin

Which issue(s) this PR fixes:

xref kubernetes/enhancements#5

Does this PR introduce a user-facing change?

The beta `PodSecurityPolicy` admission plugin, deprecated since 1.21, is removed. Follow the instructions at https://kubernetes.io/docs/tasks/configure-pod-container/migrate-from-psp/ to migrate to the built-in PodSecurity admission plugin (or to another third-party policy webhook) prior to upgrading to v1.25.

/sig auth security
/cc @deads2k @enj @ritazh @mikedanese

@k8s-ci-robot k8s-ci-robot requested a review from deads2k May 4, 2022 19:30
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label May 4, 2022
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/security Categorizes an issue or PR as relevant to SIG Security. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 4, 2022
liggitt
liggitt commented May 4, 2022
View reviewed changes
pkg/apis/policy/validation/validation.go
psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util"
)

const (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these were hoisted from k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp to allow deleting that package

liggitt
liggitt commented May 4, 2022
View reviewed changes
pkg/apis/policy/validation/validation.go
@@ -332,6 +339,44 @@ func validatePodSecurityPolicyVolumes(fldPath *field.Path, volumes []policy.FSTy
return allErrs
}

// getAllFSTypesAsSet returns all actual volume types, regardless
// of feature gates. The special policy.All pseudo type is not included.
func getAllFSTypesAsSet() sets.String {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was hoisted from k8s.io/kubernetes/pkg/security/podsecuritypolicy/util to allow deleting that package

liggitt
liggitt commented May 4, 2022
View reviewed changes
pkg/kubelet/sysctl/safe_sysctls.go
type SysctlsStrategy interface {
// Validate ensures that the specified values fall within the range of the strategy.
Validate(pod *api.Pod) field.ErrorList
// SafeSysctlAllowlist returns the allowlist of safe sysctls and safe sysctl patterns (ending in *).
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was hoisted from k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl to allow deleting that package

@k8s-ci-robot k8s-ci-robot added area/apiserver area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels May 4, 2022
@enj
Copy link
Member

enj commented May 4, 2022

/triage accepted
/milestone v1.25
/lgtm
/hold
To allow others to review.

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. triage/accepted Indicates an issue or PR is ready to be actively worked on. labels May 4, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 4, 2022
@enj
Copy link
Member

enj commented May 4, 2022

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 4, 2022
@k8s-ci-robot k8s-ci-robot added area/provider/gcp Issues or PRs related to gcp provider and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels May 4, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enj, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels May 4, 2022
@tallclair tallclair self-assigned this May 4, 2022
@deads2k
Copy link
Contributor

deads2k commented May 5, 2022

heh, yeah, test-cmd got me in the 1.25 removals.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 5, 2022
@liggitt
Copy link
Member Author

liggitt commented May 5, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 5, 2022
sftim
sftim reviewed May 5, 2022
View reviewed changes
pkg/apis/policy/validation/validation.go
Comment on lines +42 to +44
seccompDefaultProfileAnnotationKey = "seccomp.security.alpha.kubernetes.io/defaultProfileName"
// AllowedProfilesAnnotationKey specifies the allowed seccomp profiles.
seccompAllowedProfilesAnnotationKey = "seccomp.security.alpha.kubernetes.io/allowedProfileNames"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are being removed too, right? As part of #109819

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This API code is staying unchanged for 1.25 and will be removed in 1.26. The other PR is on my radar to review as well

@k8s-ci-robot k8s-ci-robot merged commit 99de679 into kubernetes:master May 5, 2022
@liggitt liggitt mentioned this pull request May 5, 2022
Merged
@github-actions github-actions bot mentioned this pull request May 11, 2022
Open
@Priyankasaggu11929 Priyankasaggu11929 mentioned this pull request Jul 21, 2022
Closed
7 tasks
@liggitt liggitt deleted the psp branch August 18, 2022 19:51
This was referenced Oct 4, 2022
Closed
Merged
@owlet42 owlet42 mentioned this pull request Oct 12, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sftim sftim sftim left review comments

@enj enj enj approved these changes

@deads2k deads2k Awaiting requested review from deads2k

@mikedanese mikedanese Awaiting requested review from mikedanese

@ritazh ritazh Awaiting requested review from ritazh

Assignees

@enj enj

@deads2k deads2k

@tallclair tallclair

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubelet area/provider/gcp Issues or PRs related to gcp provider area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/security Categorizes an issue or PR as relevant to SIG Security. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@liggitt @enj @k8s-ci-robot @deads2k @sftim @tallclair