chore: remove feature gate CombinedServices

.github/workflows/_integration_tests.yaml

@@ -51,7 +51,7 @@ jobs:
             test: postgres
           - name: feature-gates
             test: dbless
-            feature_gates: "GatewayAlpha=true,CombinedRoutes=false,CombinedServices=false"
+            feature_gates: "GatewayAlpha=true,CombinedRoutes=false"
           - name: dbless-knative
             test: dbless.knative
           - name: postgres-knative

CHANGELOG.md

@@ -77,6 +77,11 @@ Adding a new version? You'll need three changes:
 
 ## Unreleased
 
+### Breaking changes
+
+- Removed feature gate `CombinedServices`. The feature is enabled and it can't be changed.
+  [#4743](https://github.com/Kong/kubernetes-ingress-controller/pull/4743)
+
 ### Fixed
 
 - No more "log.SetLogger(...) was never called..." log entry during shutdown of KIC

FEATURE_GATES.md

@@ -63,8 +63,8 @@ Features that reach GA and over time become stable will be removed from this tab
 | CombinedRoutes   | `true`  | Beta  | 2.8.0   | TBD   |
 | GatewayAlpha     | `false` | Alpha | 2.6.0   | TBD   |
 | ExpressionRoutes | `false` | Alpha | 2.10.0  | TBD   |
-| CombinedServices | `false` | Alpha | 2.10.0  | TBD   |
-| CombinedServices | `true`  | Beta  | 2.11.0  | TBD   |
+| CombinedServices | `false` | Alpha | 2.10.0  | 3.0.0 |
+| CombinedServices | `true`  | Beta  | 2.11.0  | 3.0.0 |
 | FillIDs          | `false` | Alpha | 2.10.0  | 3.0.0 |
 | RewriteURIs      | `false` | Alpha | 2.12.0  | TBD   |
 

internal/dataplane/parser/golden_test.go

@@ -39,7 +39,6 @@ var (
 
 			// Feature flags that are directly propagated from the feature gates get their defaults.
 			CombinedServiceRoutes: featuregates.GetFeatureGatesDefaults()[featuregates.CombinedRoutesFeature],
-			CombinedServices:      featuregates.GetFeatureGatesDefaults()[featuregates.CombinedServicesFeature],
 			ExpressionRoutes:      featuregates.GetFeatureGatesDefaults()[featuregates.ExpressionRoutesFeature],
 			FillIDs:               featuregates.GetFeatureGatesDefaults()[featuregates.FillIDsFeature],
 

internal/dataplane/parser/parser.go

@@ -71,10 +71,6 @@ type FeatureFlags struct {
 	// ExpressionRoutes indicates whether to translate Kubernetes objects to expression based Kong Routes.
 	ExpressionRoutes bool
 
-	// CombinedServices enables parser to create a single Kong Service when a Kubernetes Service is referenced
-	// by multiple Ingresses. This is effective only when EnableCombinedServiceRoutes is enabled.
-	CombinedServices bool
-
 	// FillIDs enables the parser to fill in the IDs fields of Kong entities - Services, Routes, and Consumers - based
 	// on their names. It ensures that IDs remain stable across restarts of the controller.
 	FillIDs bool
@@ -103,7 +99,6 @@ func NewFeatureFlags(
 		CombinedServiceRoutes:             combinedRoutesEnabled,
 		RegexPathPrefix:                   kongVersion.GTE(versions.ExplicitRegexPathVersionCutoff),
 		ExpressionRoutes:                  expressionRoutesEnabled,
-		CombinedServices:                  combinedRoutesEnabled && featureGates.Enabled(featuregates.CombinedServicesFeature),
 		FillIDs:                           featureGates.Enabled(featuregates.FillIDsFeature),
 		RewriteURIs:                       featureGates.Enabled(featuregates.RewriteURIsFeature),
 	}

internal/dataplane/parser/parser_test.go

@@ -5062,25 +5062,21 @@ func TestNewFeatureFlags(t *testing.T) {
 			},
 		},
 		{
-			name: "combined services and routes enabled",
+			name: "combined routes enabled",
 			featureGates: map[string]bool{
-				featuregates.CombinedRoutesFeature:   true,
-				featuregates.CombinedServicesFeature: true,
+				featuregates.CombinedRoutesFeature: true,
 			},
 			expectedFeatureFlags: FeatureFlags{
 				CombinedServiceRoutes: true,
-				CombinedServices:      true,
 			},
 		},
 		{
-			name: "combined services enabled, but routes disabled",
+			name: "combined routes disabled",
 			featureGates: map[string]bool{
-				featuregates.CombinedRoutesFeature:   false,
-				featuregates.CombinedServicesFeature: true,
+				featuregates.CombinedRoutesFeature: false,
 			},
 			expectedFeatureFlags: FeatureFlags{
 				CombinedServiceRoutes: false,
-				CombinedServices:      false,
 			},
 		},
 		{