Merge pull request openshift#2349 from JoelSpeed/enable-map

openshift-merge-bot[bot] · web-flow · commit 24766a2cd069 · 2025-06-13T12:15:26.000Z
Register MutatingAdmissionPolicy in feature gates
diff --git a/features.md b/features.md
@@ -4,6 +4,7 @@
 | 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> | |  |
diff --git a/features/features.go b/features/features.go
@@ -60,6 +60,14 @@ var (
 						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
+	FeatureGateMutatingAdmissionPolicy = newFeatureGate("MutatingAdmissionPolicy").
+						reportProblemsToJiraComponent("kube-apiserver").
+						contactPerson("benluddy").
+						productScope(kubernetes).
+						enhancementPR("https://github.com/kubernetes/enhancements/issues/3962").
+						enableIn().
+						mustRegister()
+
 	FeatureGateGatewayAPI = newFeatureGate("GatewayAPI").
 				reportProblemsToJiraComponent("Routing").
 				contactPerson("miciah").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -133,6 +133,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -27,6 +27,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -39,6 +39,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -136,6 +136,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLMCatalogdAPIV1Metas"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -27,6 +27,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "ShortCertRotation"
                     }
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -39,6 +39,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "SELinuxMount"
                     },

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@`
`133`	`133`	`{`
`134`	`134`	`"name": "MultiArchInstallAzure"`
`135`	`135`	`},`
	`136`	`+ {`
	`137`	`+ "name": "MutatingAdmissionPolicy"`
	`138`	`+ },`
`136`	`139`	`{`
`137`	`140`	`"name": "NewOLM"`
`138`	`141`	`},`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@`
`27`	`27`	`{`
`28`	`28`	`"name": "MultiArchInstallAzure"`
`29`	`29`	`},`
	`30`	`+ {`
	`31`	`+ "name": "MutatingAdmissionPolicy"`
	`32`	`+ },`
`30`	`33`	`{`
`31`	`34`	`"name": "NewOLM"`
`32`	`35`	`},`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@`
`39`	`39`	`{`
`40`	`40`	`"name": "MultiArchInstallAzure"`
`41`	`41`	`},`
	`42`	`+ {`
	`43`	`+ "name": "MutatingAdmissionPolicy"`
	`44`	`+ },`
`42`	`45`	`{`
`43`	`46`	`"name": "NewOLM"`
`44`	`47`	`},`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@`
`136`	`136`	`{`
`137`	`137`	`"name": "MultiArchInstallAzure"`
`138`	`138`	`},`
	`139`	`+ {`
	`140`	`+ "name": "MutatingAdmissionPolicy"`
	`141`	`+ },`
`139`	`142`	`{`
`140`	`143`	`"name": "NewOLMCatalogdAPIV1Metas"`
`141`	`144`	`},`