From f6f1649ca42a9aa7dbfd815a190f37705a6f8c54 Mon Sep 17 00:00:00 2001 From: Neil Girard Date: Thu, 23 Jul 2026 15:24:50 -0400 Subject: [PATCH] Promote FeatureGateVSphereMixedNodeEnv to GA --- features.md | 2 +- features/features.go | 16 ++++++++-------- .../featureGate-4-10-Hypershift-Default.yaml | 6 +++--- .../featureGate-4-10-Hypershift-OKD.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-Default.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-OKD.yaml | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/features.md b/features.md index 97062fde68e..c300f69bd01 100644 --- a/features.md +++ b/features.md @@ -86,7 +86,6 @@ | SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled | | TLSAdherence| | | Enabled | Enabled | | | Enabled | Enabled | | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | Enabled | Enabled | | | Enabled | Enabled | -| VSphereMixedNodeEnv| | | Enabled | Enabled | | | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled | | AWSServiceLBNetworkSecurityGroup| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | AzureClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | @@ -116,5 +115,6 @@ | UserNamespacesPodSecurityStandards| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | UserNamespacesSupport| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | VSphereHostVMGroupZonal| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| VSphereMixedNodeEnv| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | VSphereMultiDisk| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | VSphereMultiNetworks| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 30523fa067c..5e77e7e5e25 100644 --- a/features/features.go +++ b/features/features.go @@ -797,7 +797,7 @@ var ( contactPerson("vr4manta"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1772"). - enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateVSphereMultiVCenterDay2 = newFeatureGate("VSphereMultiVCenterDay2"). @@ -1005,11 +1005,11 @@ var ( enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). mustRegister() - FeatureGateConfidentialCluster = newFeatureGate("ConfidentialCluster"). - reportProblemsToJiraComponent("ConfidentialClusters"). - contactPerson("fjin"). - productScope(ocpSpecific). - enhancementPR("https://github.com/openshift/enhancements/pull/1962"). - enable(inDevPreviewNoUpgrade()). - mustRegister() + FeatureGateConfidentialCluster = newFeatureGate("ConfidentialCluster"). + reportProblemsToJiraComponent("ConfidentialClusters"). + contactPerson("fjin"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1962"). + enable(inDevPreviewNoUpgrade()). + mustRegister() ) diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index b2d5692f612..5984dea09b7 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -269,9 +269,6 @@ { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, - { - "name": "VSphereMixedNodeEnv" - }, { "name": "VSphereMultiVCenterDay2" }, @@ -364,6 +361,9 @@ { "name": "VSphereHostVMGroupZonal" }, + { + "name": "VSphereMixedNodeEnv" + }, { "name": "VSphereMultiDisk" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 853030785ff..dd16eda9536 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -271,9 +271,6 @@ { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, - { - "name": "VSphereMixedNodeEnv" - }, { "name": "VSphereMultiVCenterDay2" }, @@ -366,6 +363,9 @@ { "name": "VSphereHostVMGroupZonal" }, + { + "name": "VSphereMixedNodeEnv" + }, { "name": "VSphereMultiDisk" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 53b6dda36d0..8bf459ba7ba 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -263,9 +263,6 @@ { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, - { - "name": "VSphereMixedNodeEnv" - }, { "name": "VSphereMultiVCenterDay2" }, @@ -364,6 +361,9 @@ { "name": "VSphereHostVMGroupZonal" }, + { + "name": "VSphereMixedNodeEnv" + }, { "name": "VSphereMultiDisk" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index fb6a5d83938..635e9e149ca 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -265,9 +265,6 @@ { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, - { - "name": "VSphereMixedNodeEnv" - }, { "name": "VSphereMultiVCenterDay2" }, @@ -366,6 +363,9 @@ { "name": "VSphereHostVMGroupZonal" }, + { + "name": "VSphereMixedNodeEnv" + }, { "name": "VSphereMultiDisk" },