Merge pull request #2018 from ibihim/psa-disable-4.17

openshift-merge-bot[bot] · web-flow · commit a3a93b2b8524 · 2024-09-10T17:41:46.000Z
features: disable PSA
diff --git a/features.md b/features.md
@@ -32,6 +32,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>  |
 | 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>  |
 | OnClusterBuild| | | <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>  |
 | PersistentIPsForVirtualization| | | <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>  |
 | PlatformOperators| | | <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>  |
@@ -78,7 +79,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>  |
 | NodeDisruptionPolicy| <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>  |
 | PrivateHostedZoneAWS| <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>  |
 | SetEIPForNLBIngressController| <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>  |
 | VSphereControlPlaneMachineSet| <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
@@ -66,9 +66,9 @@ var (
 
 	FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
 							reportProblemsToJiraComponent("auth").
-							contactPerson("stlaz").
+							contactPerson("ibihim").
 							productScope(ocpSpecific).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 							mustRegister()
 
 	FeatureGateExternalCloudProvider = newFeatureGate("ExternalCloudProvider").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -109,6 +109,9 @@
                     {
                         "name": "OnClusterBuild"
                     },
+                    {
+                        "name": "OpenShiftPodSecurityAdmission"
+                    },
                     {
                         "name": "PersistentIPsForVirtualization"
                     },
@@ -249,9 +252,6 @@
                     {
                         "name": "NodeDisruptionPolicy"
                     },
-                    {
-                        "name": "OpenShiftPodSecurityAdmission"
-                    },
                     {
                         "name": "PrivateHostedZoneAWS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -112,6 +112,9 @@
                     {
                         "name": "OnClusterBuild"
                     },
+                    {
+                        "name": "OpenShiftPodSecurityAdmission"
+                    },
                     {
                         "name": "PersistentIPsForVirtualization"
                     },
@@ -249,9 +252,6 @@
                     {
                         "name": "NodeDisruptionPolicy"
                     },
-                    {
-                        "name": "OpenShiftPodSecurityAdmission"
-                    },
                     {
                         "name": "PrivateHostedZoneAWS"
                     },

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@`
`109`	`109`	`{`
`110`	`110`	`"name": "OnClusterBuild"`
`111`	`111`	`},`
	`112`	`+ {`
	`113`	`+ "name": "OpenShiftPodSecurityAdmission"`
	`114`	`+ },`
`112`	`115`	`{`
`113`	`116`	`"name": "PersistentIPsForVirtualization"`
`114`	`117`	`},`
`@@ -249,9 +252,6 @@`
`249`	`252`	`{`
`250`	`253`	`"name": "NodeDisruptionPolicy"`
`251`	`254`	`},`
`252`		`- {`
`253`		`- "name": "OpenShiftPodSecurityAdmission"`
`254`		`- },`
`255`	`255`	`{`
`256`	`256`	`"name": "PrivateHostedZoneAWS"`
`257`	`257`	`},`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,9 @@`
`112`	`112`	`{`
`113`	`113`	`"name": "OnClusterBuild"`
`114`	`114`	`},`
	`115`	`+ {`
	`116`	`+ "name": "OpenShiftPodSecurityAdmission"`
	`117`	`+ },`
`115`	`118`	`{`
`116`	`119`	`"name": "PersistentIPsForVirtualization"`
`117`	`120`	`},`
`@@ -249,9 +252,6 @@`
`249`	`252`	`{`
`250`	`253`	`"name": "NodeDisruptionPolicy"`
`251`	`254`	`},`
`252`		`- {`
`253`		`- "name": "OpenShiftPodSecurityAdmission"`
`254`		`- },`
`255`	`255`	`{`
`256`	`256`	`"name": "PrivateHostedZoneAWS"`
`257`	`257`	`},`