Merge pull request openshift#2385 from JoelSpeed/enable-tp-map

openshift-merge-bot[bot] · web-flow · commit c631530b3679 · 2025-07-07T16:13:18.000Z
Enable MutatingAdmissionPolicy in Dev/TechPreview
diff --git a/features.md b/features.md
@@ -4,7 +4,6 @@
 | EventedPLEG| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
-| MutatingAdmissionPolicy| | | | | |  |
 | ShortCertRotation| | | | | |  |
 | BootImageSkewEnforcement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
@@ -50,6 +49,7 @@
 | MinimumKubeletVersion| | | <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>  |
 | MixedCPUsAllocation| | | <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>  |
 | MultiDiskSetup| | | <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>  |
+| MutatingAdmissionPolicy| | | <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>  |
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -57,7 +57,7 @@ var (
 						contactPerson("benluddy").
 						productScope(kubernetes).
 						enhancementPR("https://github.com/kubernetes/enhancements/issues/3962").
-						enableIn().
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateGatewayAPI = newFeatureGate("GatewayAPI").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -27,9 +27,6 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NewOLM"
                     },
@@ -221,6 +218,9 @@
                     {
                         "name": "MultiDiskSetup"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -39,9 +39,6 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NewOLM"
                     },
@@ -227,6 +224,9 @@
                     {
                         "name": "MultiDiskSetup"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -27,9 +27,6 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "ShortCertRotation"
                     }
@@ -206,6 +203,9 @@
                     {
                         "name": "MultiDiskSetup"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -39,9 +39,6 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "SELinuxMount"
                     },
@@ -212,6 +209,9 @@
                     {
                         "name": "MultiDiskSetup"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,6 @@`
`27`	`27`	`{`
`28`	`28`	`"name": "MultiArchInstallAzure"`
`29`	`29`	`},`
`30`		`- {`
`31`		`- "name": "MutatingAdmissionPolicy"`
`32`		`- },`
`33`	`30`	`{`
`34`	`31`	`"name": "NewOLM"`
`35`	`32`	`},`
`@@ -221,6 +218,9 @@`
`221`	`218`	`{`
`222`	`219`	`"name": "MultiDiskSetup"`
`223`	`220`	`},`
	`221`	`+ {`
	`222`	`+ "name": "MutatingAdmissionPolicy"`
	`223`	`+ },`
`224`	`224`	`{`
`225`	`225`	`"name": "NetworkDiagnosticsConfig"`
`226`	`226`	`},`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@`
`39`	`39`	`{`
`40`	`40`	`"name": "MultiArchInstallAzure"`
`41`	`41`	`},`
`42`		`- {`
`43`		`- "name": "MutatingAdmissionPolicy"`
`44`		`- },`
`45`	`42`	`{`
`46`	`43`	`"name": "NewOLM"`
`47`	`44`	`},`
`@@ -227,6 +224,9 @@`
`227`	`224`	`{`
`228`	`225`	`"name": "MultiDiskSetup"`
`229`	`226`	`},`
	`227`	`+ {`
	`228`	`+ "name": "MutatingAdmissionPolicy"`
	`229`	`+ },`
`230`	`230`	`{`
`231`	`231`	`"name": "NetworkDiagnosticsConfig"`
`232`	`232`	`},`