Merge pull request #2475 from kevinrizza/disable-psa-release-4.20

openshift-merge-bot[bot] · web-flow · commit a2b450eb67b5 · 2025-09-14T01:58:24.000Z
OCPBUGS-56778: Disable PSA for 4.20
diff --git a/features.md b/features.md
@@ -57,6 +57,7 @@
 | NodeSwap| | | <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>  |
 | NutanixMultiSubnets| | | <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>  |
 | OVNObservability| | | <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>  |
+| OpenShiftPodSecurityAdmission| | | <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>  |
 | PreconfiguredUDNAddresses| | | <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>  |
 | SELinuxMount| | | <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>  |
 | SignatureStores| | | <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>  |
@@ -87,7 +88,6 @@
 | NetworkDiagnosticsConfig| <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>  |
 | NetworkLiveMigration| <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>  |
 | NetworkSegmentation| <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>  |
-| OpenShiftPodSecurityAdmission| <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>  |
 | PinnedImages| <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>  |
 | ProcMountType| <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>  |
 | RouteAdvertisements| <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>  |
diff --git a/features/features.go b/features/features.go
@@ -81,7 +81,7 @@ var (
 							contactPerson("ibihim").
 							productScope(ocpSpecific).
 							enhancementPR("https://github.com/openshift/enhancements/pull/899").
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 							mustRegister()
 
 	FeatureGateBuildCSIVolumes = newFeatureGate("BuildCSIVolumes").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -178,6 +178,9 @@
                     {
                         "name": "OVNObservability"
                     },
+                    {
+                        "name": "OpenShiftPodSecurityAdmission"
+                    },
                     {
                         "name": "PreconfiguredUDNAddresses"
                     },
@@ -276,9 +279,6 @@
                     {
                         "name": "NetworkSegmentation"
                     },
-                    {
-                        "name": "OpenShiftPodSecurityAdmission"
-                    },
                     {
                         "name": "PinnedImages"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -178,6 +178,9 @@
                     {
                         "name": "OVNObservability"
                     },
+                    {
+                        "name": "OpenShiftPodSecurityAdmission"
+                    },
                     {
                         "name": "PreconfiguredUDNAddresses"
                     },
@@ -276,9 +279,6 @@
                     {
                         "name": "NewOLM"
                     },
-                    {
-                        "name": "OpenShiftPodSecurityAdmission"
-                    },
                     {
                         "name": "PinnedImages"
                     },

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,9 @@`
`178`	`178`	`{`
`179`	`179`	`"name": "OVNObservability"`
`180`	`180`	`},`
	`181`	`+ {`
	`182`	`+ "name": "OpenShiftPodSecurityAdmission"`
	`183`	`+ },`
`181`	`184`	`{`
`182`	`185`	`"name": "PreconfiguredUDNAddresses"`
`183`	`186`	`},`
`@@ -276,9 +279,6 @@`
`276`	`279`	`{`
`277`	`280`	`"name": "NetworkSegmentation"`
`278`	`281`	`},`
`279`		`- {`
`280`		`- "name": "OpenShiftPodSecurityAdmission"`
`281`		`- },`
`282`	`282`	`{`
`283`	`283`	`"name": "PinnedImages"`
`284`	`284`	`},`