features: remove MachineConfigNodes and PinnedImages feature gates

isabella-janssen · isabella-janssen · commit e8756334a86a · 2026-02-17T15:57:12.000-05:00
diff --git a/features.md b/features.md
@@ -92,7 +92,6 @@
 | ImageStreamImportMode| <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>  |
 | ImageVolume| <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>  |
 | KMSv1| <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>  |
-| MachineConfigNodes| <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>  |
 | ManagedBootImages| <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>  |
 | ManagedBootImagesAWS| <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>  |
 | ManagedBootImagesAzure| <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>  |
@@ -101,7 +100,6 @@
 | 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>  |
 | 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>  |
-| 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> | <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>  |
 | SigstoreImageVerification| <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>  |
diff --git a/features/features.go b/features/features.go
@@ -218,14 +218,6 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	FeatureGateMachineConfigNodes = newFeatureGate("MachineConfigNodes").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("ijanssen").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1765").
-					enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateImageModeStatusReporting = newFeatureGate("ImageModeStatusReporting").
 						reportProblemsToJiraComponent("MachineConfigOperator").
 						contactPerson("ijanssen").
@@ -345,14 +337,6 @@ var (
 				enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
 
-	FeatureGatePinnedImages = newFeatureGate("PinnedImages").
-				reportProblemsToJiraComponent("MachineConfigOperator").
-				contactPerson("RishabhSaini").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
-
 	FeatureGateUpgradeStatus = newFeatureGate("UpgradeStatus").
 					reportProblemsToJiraComponent("Cluster Version Operator").
 					contactPerson("pmuller").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -290,9 +290,6 @@
                     {
                         "name": "KMSv1"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -317,9 +314,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -241,9 +241,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -298,9 +295,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -292,9 +292,6 @@
                     {
                         "name": "KMSv1"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -319,9 +316,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -247,9 +247,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -301,9 +298,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -281,9 +281,6 @@
                     {
                         "name": "KMSv1"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -317,9 +314,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -220,9 +220,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -298,9 +295,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -283,9 +283,6 @@
                     {
                         "name": "KMSv1"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -319,9 +316,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -226,9 +226,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineConfigNodes"
-                    },
                     {
                         "name": "ManagedBootImages"
                     },
@@ -301,9 +298,6 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
-                    {
-                        "name": "PinnedImages"
-                    },
                     {
                         "name": "RouteExternalCertificate"
                     },

Original file line number	Diff line number	Diff line change
`@@ -290,9 +290,6 @@`
`290`	`290`	`{`
`291`	`291`	`"name": "KMSv1"`
`292`	`292`	`},`
`293`		`- {`
`294`		`- "name": "MachineConfigNodes"`
`295`		`- },`
`296`	`293`	`{`
`297`	`294`	`"name": "ManagedBootImages"`
`298`	`295`	`},`
`@@ -317,9 +314,6 @@`
`317`	`314`	`{`
`318`	`315`	`"name": "OpenShiftPodSecurityAdmission"`
`319`	`316`	`},`
`320`		`- {`
`321`		`- "name": "PinnedImages"`
`322`		`- },`
`323`	`317`	`{`
`324`	`318`	`"name": "RouteExternalCertificate"`
`325`	`319`	`},`
Original file line number	Diff line number	Diff line change
`@@ -241,9 +241,6 @@`
`241`	`241`	`{`
`242`	`242`	`"name": "MachineAPIMigration"`
`243`	`243`	`},`
`244`		`- {`
`245`		`- "name": "MachineConfigNodes"`
`246`		`- },`
`247`	`244`	`{`
`248`	`245`	`"name": "ManagedBootImages"`
`249`	`246`	`},`
`@@ -298,9 +295,6 @@`
`298`	`295`	`{`
`299`	`296`	`"name": "OpenShiftPodSecurityAdmission"`
`300`	`297`	`},`
`301`		`- {`
`302`		`- "name": "PinnedImages"`
`303`		`- },`
`304`	`298`	`{`
`305`	`299`	`"name": "ProvisioningRequestAvailable"`
`306`	`300`	`},`
Original file line number	Diff line number	Diff line change
`@@ -292,9 +292,6 @@`
`292`	`292`	`{`
`293`	`293`	`"name": "KMSv1"`
`294`	`294`	`},`
`295`		`- {`
`296`		`- "name": "MachineConfigNodes"`
`297`		`- },`
`298`	`295`	`{`
`299`	`296`	`"name": "ManagedBootImages"`
`300`	`297`	`},`
`@@ -319,9 +316,6 @@`
`319`	`316`	`{`
`320`	`317`	`"name": "OpenShiftPodSecurityAdmission"`
`321`	`318`	`},`
`322`		`- {`
`323`		`- "name": "PinnedImages"`
`324`		`- },`
`325`	`319`	`{`
`326`	`320`	`"name": "RouteExternalCertificate"`
`327`	`321`	`},`
Original file line number	Diff line number	Diff line change
`@@ -247,9 +247,6 @@`
`247`	`247`	`{`
`248`	`248`	`"name": "MachineAPIMigration"`
`249`	`249`	`},`
`250`		`- {`
`251`		`- "name": "MachineConfigNodes"`
`252`		`- },`
`253`	`250`	`{`
`254`	`251`	`"name": "ManagedBootImages"`
`255`	`252`	`},`
`@@ -301,9 +298,6 @@`
`301`	`298`	`{`
`302`	`299`	`"name": "OpenShiftPodSecurityAdmission"`
`303`	`300`	`},`
`304`		`- {`
`305`		`- "name": "PinnedImages"`
`306`		`- },`
`307`	`301`	`{`
`308`	`302`	`"name": "RouteExternalCertificate"`
`309`	`303`	`},`
Original file line number	Diff line number	Diff line change
`@@ -281,9 +281,6 @@`
`281`	`281`	`{`
`282`	`282`	`"name": "KMSv1"`
`283`	`283`	`},`
`284`		`- {`
`285`		`- "name": "MachineConfigNodes"`
`286`		`- },`
`287`	`284`	`{`
`288`	`285`	`"name": "ManagedBootImages"`
`289`	`286`	`},`
`@@ -317,9 +314,6 @@`
`317`	`314`	`{`
`318`	`315`	`"name": "OpenShiftPodSecurityAdmission"`
`319`	`316`	`},`
`320`		`- {`
`321`		`- "name": "PinnedImages"`
`322`		`- },`
`323`	`317`	`{`
`324`	`318`	`"name": "RouteExternalCertificate"`
`325`	`319`	`},`
Original file line number	Diff line number	Diff line change
`@@ -220,9 +220,6 @@`
`220`	`220`	`{`
`221`	`221`	`"name": "MachineAPIMigration"`
`222`	`222`	`},`
`223`		`- {`
`224`		`- "name": "MachineConfigNodes"`
`225`		`- },`
`226`	`223`	`{`
`227`	`224`	`"name": "ManagedBootImages"`
`228`	`225`	`},`
`@@ -298,9 +295,6 @@`
`298`	`295`	`{`
`299`	`296`	`"name": "OpenShiftPodSecurityAdmission"`
`300`	`297`	`},`
`301`		`- {`
`302`		`- "name": "PinnedImages"`
`303`		`- },`
`304`	`298`	`{`
`305`	`299`	`"name": "ProvisioningRequestAvailable"`
`306`	`300`	`},`
Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,6 @@`
`283`	`283`	`{`
`284`	`284`	`"name": "KMSv1"`
`285`	`285`	`},`
`286`		`- {`
`287`		`- "name": "MachineConfigNodes"`
`288`		`- },`
`289`	`286`	`{`
`290`	`287`	`"name": "ManagedBootImages"`
`291`	`288`	`},`
`@@ -319,9 +316,6 @@`
`319`	`316`	`{`
`320`	`317`	`"name": "OpenShiftPodSecurityAdmission"`
`321`	`318`	`},`
`322`		`- {`
`323`		`- "name": "PinnedImages"`
`324`		`- },`
`325`	`319`	`{`
`326`	`320`	`"name": "RouteExternalCertificate"`
`327`	`321`	`},`
Original file line number	Diff line number	Diff line change
`@@ -226,9 +226,6 @@`
`226`	`226`	`{`
`227`	`227`	`"name": "MachineAPIMigration"`
`228`	`228`	`},`
`229`		`- {`
`230`		`- "name": "MachineConfigNodes"`
`231`		`- },`
`232`	`229`	`{`
`233`	`230`	`"name": "ManagedBootImages"`
`234`	`231`	`},`
`@@ -301,9 +298,6 @@`
`301`	`298`	`{`
`302`	`299`	`"name": "OpenShiftPodSecurityAdmission"`
`303`	`300`	`},`
`304`		`- {`
`305`		`- "name": "PinnedImages"`
`306`		`- },`
`307`	`301`	`{`
`308`	`302`	`"name": "RouteExternalCertificate"`
`309`	`303`	`},`