From 6a76ae33c32750cc891bf101901c833ed7425a5f Mon Sep 17 00:00:00 2001 From: tzivkovi Date: Tue, 3 Mar 2026 14:11:12 -0800 Subject: [PATCH] Add MachineAPIMigrationVSphere feature gate for DevPreview Enables the Machine API migration feature for vSphere platform in DevPreviewNoUpgrade feature set to support migrating from Machine API to Cluster API on vSphere clusters. --- features.md | 1 + features/features.go | 7 +++++++ .../featuregates/featureGate-4-10-Hypershift-Default.yaml | 3 +++ .../featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml | 3 +++ .../featuregates/featureGate-4-10-Hypershift-OKD.yaml | 3 +++ .../featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml | 3 +++ .../featureGate-4-10-SelfManagedHA-Default.yaml | 3 +++ ...featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml | 3 +++ .../featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml | 3 +++ ...eatureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml | 3 +++ 10 files changed, 32 insertions(+) diff --git a/features.md b/features.md index 5259884ec63..b24444f0b6a 100644 --- a/features.md +++ b/features.md @@ -11,6 +11,7 @@ | Example2| | | Enabled | Enabled | | | | | | ExternalSnapshotMetadata| | | Enabled | Enabled | | | | | | KMSEncryptionProvider| | | Enabled | Enabled | | | | | +| MachineAPIMigrationVSphere| | | Enabled | Enabled | | | | | | NetworkConnect| | | Enabled | Enabled | | | | | | NewOLMBoxCutterRuntime| | | | Enabled | | | | Enabled | | NewOLMCatalogdAPIV1Metas| | | | Enabled | | | | Enabled | diff --git a/features/features.go b/features/features.go index 3ba5f3113e9..3951808513e 100644 --- a/features/features.go +++ b/features/features.go @@ -559,6 +559,13 @@ var ( enhancementPR("https://github.com/openshift/enhancements/pull/1465"). enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() + FeatureGateMachineAPIMigrationVSphere = newFeatureGate("MachineAPIMigrationVSphere"). + reportProblemsToJiraComponent("SPLAT"). + contactPerson("jcpowermac"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1465"). + enable(inDevPreviewNoUpgrade()). + mustRegister() FeatureGateClusterAPIMachineManagement = newFeatureGate("ClusterAPIMachineManagement"). reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index db59d186a29..b9842048698 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -188,6 +188,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml index bcb089a53bf..5ae305fd4b0 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml @@ -267,6 +267,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineConfigNodes" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 332c549cafa..64413667864 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -190,6 +190,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml index dcf160c5417..1f3eab702fe 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml @@ -40,6 +40,9 @@ { "name": "KMSEncryptionProvider" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 72e73eb4233..acfdee700fa 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -191,6 +191,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml index f29f4947246..956c65925b5 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -246,6 +246,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineConfigNodes" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 7f29f0d1a1a..ea60cde1c46 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -193,6 +193,9 @@ { "name": "MachineAPIMigrationOpenStack" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml index be6d15233f7..f825e7fce58 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -43,6 +43,9 @@ { "name": "KMSEncryptionProvider" }, + { + "name": "MachineAPIMigrationVSphere" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" },