diff --git a/features.md b/features.md
index adfd5a7e76b..b09cc21828f 100644
--- a/features.md
+++ b/features.md
@@ -92,7 +92,6 @@
| ImageStreamImportMode| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ImageVolume| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| KMSv1| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
-| MachineConfigNodes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ManagedBootImages| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ManagedBootImagesAWS| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ManagedBootImagesAzure| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
@@ -101,7 +100,6 @@
| MetricsCollectionProfiles| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| MutableCSINodeAllocatableCount| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| OpenShiftPodSecurityAdmission| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
-| PinnedImages| 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 |
| SigstoreImageVerification| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 4504ddb8c30..85b18b30e22 100644
--- 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
index 17caf4f0c04..65b5fb5d6f1 100644
--- 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
index 481393ee841..843e07134b8 100644
--- 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
index ea3e6f2a366..0bde32ae74f 100644
--- 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
index 24ac4e062e3..cccfd6d239b 100644
--- 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
index 2d988f4b40c..c72a314d225 100644
--- 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
index 10525863cd1..e3e5b9829d8 100644
--- 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
index ba9f6f806f9..3c27b345548 100644
--- 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
index d1211a6b098..037604d3abf 100644
--- 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"
},