From f59952021011b2edc119789efcf32b12c3a9a887 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Mon, 22 Jun 2026 14:20:51 +0000 Subject: [PATCH] SPLAT-2588: fix hypershift topology variant to match Sippy classification The featuregate-test-analyzer defined requiredHypershiftJobVariants with Topology: hypershift, but Sippy classifies hypershift jobs as Topology: external. This mismatch caused verify-feature-promotion to find 0 tests when querying for hypershift variant test results. Also promotes AWSServiceLBNetworkSecurityGroup to Default on Hypershift to validate the topology fix via CI. Co-Authored-By: Claude Opus 4.6 --- features.md | 2 +- features/features.go | 3 +-- .../featuregates/featureGate-4-10-Hypershift-Default.yaml | 6 +++--- .../featuregates/featureGate-4-10-Hypershift-OKD.yaml | 6 +++--- tools/codegen/cmd/featuregate-test-analyzer.go | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/features.md b/features.md index 0b16169cfe9..ff2e23ba772 100644 --- a/features.md +++ b/features.md @@ -90,9 +90,9 @@ | VSphereMixedNodeEnv| | | Enabled | Enabled | | | Enabled | Enabled | | VSphereMultiVCenterDay2| | | Enabled | Enabled | | | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled | -| AWSServiceLBNetworkSecurityGroup| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | OSStreams| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | AWSClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| AWSServiceLBNetworkSecurityGroup| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AzureClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BootImageSkewEnforcement| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 1d0f9bcce43..0bcf747e0c9 100644 --- a/features/features.go +++ b/features/features.go @@ -814,8 +814,7 @@ var ( contactPerson("mtulio"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1802"). - enable(inClusterProfile(SelfManaged), inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). - enable(inClusterProfile(Hypershift), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateNoRegistryClusterInstall = newFeatureGate("NoRegistryClusterInstall"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 389432b924e..d225800163e 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -26,9 +26,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, @@ -292,6 +289,9 @@ { "name": "AWSClusterHostedDNSInstall" }, + { + "name": "AWSServiceLBNetworkSecurityGroup" + }, { "name": "AzureClusterHostedDNSInstall" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 52a878dbfdd..b2c37359a96 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -28,9 +28,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, @@ -294,6 +291,9 @@ { "name": "AWSClusterHostedDNSInstall" }, + { + "name": "AWSServiceLBNetworkSecurityGroup" + }, { "name": "AzureClusterHostedDNSInstall" }, diff --git a/tools/codegen/cmd/featuregate-test-analyzer.go b/tools/codegen/cmd/featuregate-test-analyzer.go index 3c243dae9c3..7cdcdbe525a 100644 --- a/tools/codegen/cmd/featuregate-test-analyzer.go +++ b/tools/codegen/cmd/featuregate-test-analyzer.go @@ -601,7 +601,7 @@ var ( { Cloud: "aws", Architecture: "amd64", - Topology: "hypershift", + Topology: "external", }, // ibm and powervs? }