diff --git a/features.md b/features.md
index 7295eba5965..5259ef8005b 100644
--- a/features.md
+++ b/features.md
@@ -1,5 +1,6 @@
| FeatureGate | Default on Hypershift | Default on SelfManagedHA | DevPreviewNoUpgrade on Hypershift | DevPreviewNoUpgrade on SelfManagedHA | OKD on Hypershift | OKD on SelfManagedHA | TechPreviewNoUpgrade on Hypershift | TechPreviewNoUpgrade on SelfManagedHA |
| ------ | --- | --- | --- | --- | --- | --- | --- | --- |
+| AWSServiceLBNetworkSecurityGroup| | | | | | | | |
| ClientsAllowCBOR| | | | | | | | |
| ClusterAPIInstall| | | | | | | | |
| EventedPLEG| | | | | | | | |
@@ -85,7 +86,6 @@
| 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 |
| 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 f6e6f6bc64d..53215933d47 100644
--- a/features/features.go
+++ b/features/features.go
@@ -614,7 +614,6 @@ var (
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
-
FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
reportProblemsToJiraComponent("SPLAT").
contactPerson("rvanderp").
@@ -779,8 +778,6 @@ 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()).
mustRegister()
FeatureGateNoRegistryClusterInstall = newFeatureGate("NoRegistryClusterInstall").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index 192adaf1d3f..355cdb14c3c 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -16,6 +16,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "ClientsAllowCBOR"
},
@@ -75,9 +78,6 @@
{
"name": "AWSEuropeanSovereignCloudInstall"
},
- {
- "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 b22f6498a44..f30e7234b6f 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -16,6 +16,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "ClientsAllowCBOR"
},
@@ -108,9 +111,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 bb62cb094d7..0d68ce87f63 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -29,6 +29,9 @@
{
"name": "AWSEuropeanSovereignCloudInstall"
},
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AdditionalStorageConfig"
},
@@ -265,9 +268,6 @@
}
],
"enabled": [
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AzureClusterHostedDNSInstall"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index a693597d4ce..32317ee19cc 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -16,6 +16,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "ClientsAllowCBOR"
},
@@ -54,9 +57,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 5787abe5405..96b6b10ed9c 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -31,6 +31,9 @@
{
"name": "AWSEuropeanSovereignCloudInstall"
},
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AdditionalStorageConfig"
},
@@ -267,9 +270,6 @@
}
],
"enabled": [
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AzureClusterHostedDNSInstall"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index d160fbccdf7..6d4f6431401 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -16,6 +16,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "ClientsAllowCBOR"
},
@@ -87,9 +90,6 @@
{
"name": "AWSEuropeanSovereignCloudInstall"
},
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AdditionalStorageConfig"
},