diff --git a/features.md b/features.md index c89925276f6..e435e4a1e6e 100644 --- a/features.md +++ b/features.md @@ -94,7 +94,6 @@ | OSStreams| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | AWSClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AWSDualStackInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | -| AWSServiceLBNetworkSecurityGroup| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AdditionalStorageConfig| 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 591b6147b1b..029c5cf09c0 100644 --- a/features/features.go +++ b/features/features.go @@ -809,14 +809,6 @@ var ( enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() - FeatureGateAWSServiceLBNetworkSecurityGroup = newFeatureGate("AWSServiceLBNetworkSecurityGroup"). - reportProblemsToJiraComponent("Cloud Compute / Cloud Controller Manager"). - contactPerson("mtulio"). - productScope(ocpSpecific). - enhancementPR("https://github.com/openshift/enhancements/pull/1802"). - enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). - mustRegister() - FeatureGateNoRegistryClusterInstall = newFeatureGate("NoRegistryClusterInstall"). reportProblemsToJiraComponent("Installer / Agent based installation"). contactPerson("andfasano"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 292c3dd7f37..5296a811b4e 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -295,9 +295,6 @@ { "name": "AWSDualStackInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml index 870d6c20a94..e133f83bfde 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml @@ -99,9 +99,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index d6089ff7acd..c485baee2a0 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -297,9 +297,6 @@ { "name": "AWSDualStackInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml index de7954d1d43..4dcbf389967 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml @@ -129,9 +129,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 493f2840256..80e851d2db2 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -280,9 +280,6 @@ { "name": "AWSDualStackInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml index a1050ca6736..bc213c8446b 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -66,9 +66,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 6a7972dc6c9..4d1c632c4c5 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -282,9 +282,6 @@ { "name": "AWSDualStackInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml index 7e40f034e57..5f3ebfdbc2f 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -102,9 +102,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, diff --git a/tools/codegen/cmd/featuregate-test-analyzer_test.go b/tools/codegen/cmd/featuregate-test-analyzer_test.go index 24d2bad6c20..9d8f06ad3c8 100644 --- a/tools/codegen/cmd/featuregate-test-analyzer_test.go +++ b/tools/codegen/cmd/featuregate-test-analyzer_test.go @@ -611,7 +611,7 @@ func Test_filterVariants(t *testing.T) { }{ { name: "AWS feature gate matches aws hypershift variant with external topology", - featureGate: "AWSServiceLBNetworkSecurityGroup", + featureGate: "AWSClusterHostedDNS", variants: [][]JobVariant{ requiredHypershiftJobVariants, },