diff --git a/features.md b/features.md
index cea7c4c0ece..0e24c981459 100644
--- a/features.md
+++ b/features.md
@@ -72,7 +72,6 @@
| MinimumKubeletVersion| | | Enabled | Enabled | | | Enabled | Enabled |
| MixedCPUsAllocation| | | Enabled | Enabled | | | Enabled | Enabled |
| MultiDiskSetup| | | Enabled | Enabled | | | Enabled | Enabled |
-| MutatingAdmissionPolicy| | | Enabled | Enabled | | | Enabled | Enabled |
| NewOLM| | Enabled | | Enabled | | Enabled | | Enabled |
| NewOLMWebhookProviderOpenshiftServiceCA| | Enabled | | Enabled | | Enabled | | Enabled |
| NoOverlayMode| | | Enabled | Enabled | | | Enabled | Enabled |
@@ -103,6 +102,7 @@
| ManagedBootImagesCPMS| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| MetricsCollectionProfiles| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| MutableCSINodeAllocatableCount| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
+| MutatingAdmissionPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| OpenShiftPodSecurityAdmission| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| RouteExternalCertificate| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ServiceAccountTokenNodeBinding| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 5a576b3b628..3838fd2dbe0 100644
--- a/features/features.go
+++ b/features/features.go
@@ -88,7 +88,7 @@ var (
contactPerson("benluddy").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/3962").
- enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+ enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
@@ -614,7 +614,6 @@ var (
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
-
FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
reportProblemsToJiraComponent("SPLAT").
contactPerson("rvanderp").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index 2006f133aeb..23192bb139d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -200,9 +200,6 @@
{
"name": "MultiDiskSetup"
},
- {
- "name": "MutatingAdmissionPolicy"
- },
{
"name": "NetworkConnect"
},
@@ -325,6 +322,9 @@
{
"name": "MutableCSINodeAllocatableCount"
},
+ {
+ "name": "MutatingAdmissionPolicy"
+ },
{
"name": "OpenShiftPodSecurityAdmission"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index 11c85ab0211..06a2930b649 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -202,9 +202,6 @@
{
"name": "MultiDiskSetup"
},
- {
- "name": "MutatingAdmissionPolicy"
- },
{
"name": "NetworkConnect"
},
@@ -327,6 +324,9 @@
{
"name": "MutableCSINodeAllocatableCount"
},
+ {
+ "name": "MutatingAdmissionPolicy"
+ },
{
"name": "OpenShiftPodSecurityAdmission"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 3e55d6a392c..bcf06761ea1 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -200,9 +200,6 @@
{
"name": "MultiDiskSetup"
},
- {
- "name": "MutatingAdmissionPolicy"
- },
{
"name": "NetworkConnect"
},
@@ -319,6 +316,9 @@
{
"name": "MutableCSINodeAllocatableCount"
},
+ {
+ "name": "MutatingAdmissionPolicy"
+ },
{
"name": "NewOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index b762fe85326..2ddb0b2b88d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -202,9 +202,6 @@
{
"name": "MultiDiskSetup"
},
- {
- "name": "MutatingAdmissionPolicy"
- },
{
"name": "NetworkConnect"
},
@@ -321,6 +318,9 @@
{
"name": "MutableCSINodeAllocatableCount"
},
+ {
+ "name": "MutatingAdmissionPolicy"
+ },
{
"name": "NewOLM"
},