Skip to content

OCPBUGS-74525: OCPBUGS-74526: Remove UserNamespacesPodSecurityStandards and UserNamespacesSupport #2762

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

Draft
bitoku wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

OCPBUGS-74525: OCPBUGS-74526: Remove UserNamespacesPodSecurityStandards and UserNamespacesSupport #2762

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
2 changes: 0 additions & 2 deletions features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,5 @@
| SigstoreImageVerificationPKI| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| StoragePerformantSecurityPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| UpgradeStatus| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| UserNamespacesPodSecurityStandards| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| UserNamespacesSupport| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| VSphereMultiDisk| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| VSphereMultiNetworks| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
18 changes: 0 additions & 18 deletions features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,24 +630,6 @@ var (
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()

FeatureGateUserNamespacesSupport = newFeatureGate("UserNamespacesSupport").
reportProblemsToJiraComponent("Node").
contactPerson("haircommander").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()

// Note: this feature is perma-alpha, but it is safe and desireable to enable.
// It was an oversight in upstream to not remove the feature gate after the version skew became safe in 1.33.
// See https://github.com/kubernetes/enhancements/tree/d4226c42/keps/sig-node/127-user-namespaces#pod-security-standards-pss-integration
FeatureGateUserNamespacesPodSecurityStandards = newFeatureGate("UserNamespacesPodSecurityStandards").
reportProblemsToJiraComponent("Node").
contactPerson("haircommander").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()

FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
reportProblemsToJiraComponent("SPLAT").
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereMultiDisk"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereMultiDisk"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereMultiDisk"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereMultiDisk"
},
Expand Down
6 changes: 0 additions & 6 deletions payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,6 @@
{
"name": "UpgradeStatus"
},
{
"name": "UserNamespacesPodSecurityStandards"
},
{
"name": "UserNamespacesSupport"
},
{
"name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
},
Expand Down
1 change: 0 additions & 1 deletion security/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

107 changes: 0 additions & 107 deletions .../securitycontextconstraints.security.openshift.io/UserNamespacesPodSecurityStandards.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion security/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ type SecurityContextConstraints struct {
// When "AllowHostLevel" is set, a pod author may set `hostUsers` to either `true` or `false`.
// When "RequirePodLevel" is set, a pod author must set `hostUsers` to `false`.
// When omitted, the default value is "AllowHostLevel".
// +openshift:enable:FeatureGate=UserNamespacesPodSecurityStandards
// +kubebuilder:validation:Enum="AllowHostLevel";"RequirePodLevel"
// +kubebuilder:default:="AllowHostLevel"
// +default="AllowHostLevel"
Expand Down
3 changes: 1 addition & 2 deletions security/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ securitycontextconstraints.security.openshift.io:
CRDName: securitycontextconstraints.security.openshift.io
Capability: ""
Category: ""
FeatureGates:
- UserNamespacesPodSecurityStandards
FeatureGates: []
FilenameOperatorName: config-operator
FilenameOperatorOrdering: "01"
FilenameRunLevel: "0000_03"
Expand Down
12 changes: 12 additions & 0 deletions ...turegated-crd-manifests/securitycontextconstraints.security.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,18 @@ spec:
groups is used in the SecurityContext.
type: string
type: object
userNamespaceLevel:
default: AllowHostLevel
description: |-
userNamespaceLevel determines if the policy allows host users in containers.
Valid values are "AllowHostLevel", "RequirePodLevel", and omitted.
When "AllowHostLevel" is set, a pod author may set `hostUsers` to either `true` or `false`.
When "RequirePodLevel" is set, a pod author must set `hostUsers` to `false`.
When omitted, the default value is "AllowHostLevel".
enum:
- AllowHostLevel
- RequirePodLevel
type: string
users:
description: The users who have permissions to use this security context
constraints
Expand Down
Loading