diff --git a/features.md b/features.md index c756969898b..702d1c1fb57 100644 --- a/features.md +++ b/features.md @@ -87,8 +87,8 @@ | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | Enabled | Enabled | | | Enabled | Enabled | | VSphereMixedNodeEnv| | | Enabled | Enabled | | | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled | -| AWSServiceLBNetworkSecurityGroup| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | OSStreams| | 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 16478fbb208..5fa45fb0ffb 100644 --- a/features/features.go +++ b/features/features.go @@ -786,8 +786,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 5ee9176976e..77fbafc5f05 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -29,9 +29,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, @@ -280,6 +277,9 @@ } ], "enabled": [ + { + "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 68fb4d6325a..7c32265d4e4 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -31,9 +31,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AWSServiceLBNetworkSecurityGroup" - }, { "name": "AdditionalStorageConfig" }, @@ -282,6 +279,9 @@ } ], "enabled": [ + { + "name": "AWSServiceLBNetworkSecurityGroup" + }, { "name": "AzureClusterHostedDNSInstall" },