Merge pull request openshift#2354 from mtulio/SPLAT-2137-ccm-nlb-sg

openshift-merge-bot[bot] · web-flow · commit 7f6237cec78d · 2025-06-04T08:03:33.000Z
SPLAT-2137: FG for Service Type LB NLB with Security Group
diff --git a/features.md b/features.md
@@ -17,6 +17,7 @@
 | NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AWSDedicatedHosts| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| AWSServiceLBNetworkSecurityGroup| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AutomatedEtcdBackup| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AzureDedicatedHosts| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AzureMultiDisk| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -814,4 +814,12 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1793").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
+
+	FeatureGateAWSServiceLBNetworkSecurityGroup = newFeatureGate("AWSServiceLBNetworkSecurityGroup").
+					reportProblemsToJiraComponent("Cloud Compute / Cloud Controller Manager").
+					contactPerson("mtulio").
+					productScope(ocpSpecific).
+					enhancementPR("https://github.com/openshift/enhancements/pull/1802").
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -19,6 +19,9 @@
                     {
                         "name": "AWSDedicatedHosts"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AutomatedEtcdBackup"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -56,6 +56,9 @@
                     {
                         "name": "AWSEFSDriverVolumeMetrics"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -71,6 +71,9 @@
                     {
                         "name": "AWSEFSDriverVolumeMetrics"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -19,6 +19,9 @@
                     {
                         "name": "AWSDedicatedHosts"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AutomatedEtcdBackup"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -41,6 +41,9 @@
                     {
                         "name": "AWSEFSDriverVolumeMetrics"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -56,6 +56,9 @@
                     {
                         "name": "AWSEFSDriverVolumeMetrics"
                     },
+                    {
+                        "name": "AWSServiceLBNetworkSecurityGroup"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`{`
`20`	`20`	`"name": "AWSDedicatedHosts"`
`21`	`21`	`},`
	`22`	`+ {`
	`23`	`+ "name": "AWSServiceLBNetworkSecurityGroup"`
	`24`	`+ },`
`22`	`25`	`{`
`23`	`26`	`"name": "AutomatedEtcdBackup"`
`24`	`27`	`},`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@`
`56`	`56`	`{`
`57`	`57`	`"name": "AWSEFSDriverVolumeMetrics"`
`58`	`58`	`},`
	`59`	`+ {`
	`60`	`+ "name": "AWSServiceLBNetworkSecurityGroup"`
	`61`	`+ },`
`59`	`62`	`{`
`60`	`63`	`"name": "AdditionalRoutingCapabilities"`
`61`	`64`	`},`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@`
`71`	`71`	`{`
`72`	`72`	`"name": "AWSEFSDriverVolumeMetrics"`
`73`	`73`	`},`
	`74`	`+ {`
	`75`	`+ "name": "AWSServiceLBNetworkSecurityGroup"`
	`76`	`+ },`
`74`	`77`	`{`
`75`	`78`	`"name": "AdditionalRoutingCapabilities"`
`76`	`79`	`},`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@`
`41`	`41`	`{`
`42`	`42`	`"name": "AWSEFSDriverVolumeMetrics"`
`43`	`43`	`},`
	`44`	`+ {`
	`45`	`+ "name": "AWSServiceLBNetworkSecurityGroup"`
	`46`	`+ },`
`44`	`47`	`{`
`45`	`48`	`"name": "AdditionalRoutingCapabilities"`
`46`	`49`	`},`