Merge pull request openshift#2832 from jubittajohn/add-mutatingadmissionpolicy-to-default-set

OCPSTRAT-3036: Promote MutatingAdmissionPolicy feature to Default

Author: openshift-merge-bot[bot]

features.md

@@ -72,7 +72,6 @@
 | 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>  |
 | NewOLM| | <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>  |
 | NewOLMWebhookProviderOpenshiftServiceCA| | <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>  |
 | NoOverlayMode| | | <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>  |
@@ -104,6 +103,7 @@
 | ManagedBootImagesCPMS| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MetricsCollectionProfiles| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MutableCSINodeAllocatableCount| <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> | <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> | <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | RouteExternalCertificate| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ServiceAccountTokenNodeBinding| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

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").
@@ -622,7 +622,6 @@ var (
 						enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 
-
 	FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
 					reportProblemsToJiraComponent("SPLAT").
 					contactPerson("rvanderp").

payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml

@@ -197,9 +197,6 @@
                     {
                         "name": "MultiDiskSetup"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NetworkConnect"
                     },
@@ -328,6 +325,9 @@
                     {
                         "name": "MutableCSINodeAllocatableCount"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },

payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml

@@ -199,9 +199,6 @@
                     {
                         "name": "MultiDiskSetup"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NetworkConnect"
                     },
@@ -330,6 +327,9 @@
                     {
                         "name": "MutableCSINodeAllocatableCount"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },

payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml

@@ -197,9 +197,6 @@
                     {
                         "name": "MultiDiskSetup"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NetworkConnect"
                     },
@@ -322,6 +319,9 @@
                     {
                         "name": "MutableCSINodeAllocatableCount"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLM"
                     },

payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml

@@ -199,9 +199,6 @@
                     {
                         "name": "MultiDiskSetup"
                     },
-                    {
-                        "name": "MutatingAdmissionPolicy"
-                    },
                     {
                         "name": "NetworkConnect"
                     },
@@ -324,6 +321,9 @@
                     {
                         "name": "MutableCSINodeAllocatableCount"
                     },
+                    {
+                        "name": "MutatingAdmissionPolicy"
+                    },
                     {
                         "name": "NewOLM"
                     },