chore: graduate feature gate FillIDs to Beta and set to true by defau…

…lt (#4746)
Kong · Sep 28, 2023 · afb3444 · afb3444
1 parent 95b0447
commit afb3444
Show file tree

Hide file tree

Showing 42 changed files with 103 additions and 23 deletions.
diff --git a/.github/workflows/_integration_tests.yaml b/.github/workflows/_integration_tests.yaml
@@ -74,10 +74,10 @@ jobs:
             router-flavor: "expressions"
           - name: dbless-fill-ids
             test: dbless
-            feature_gates: "GatewayAlpha=true,FillIDs=true"
+            feature_gates: "GatewayAlpha=true"
           - name: postgres-fill-ids
             test: postgres
-            feature_gates: "GatewayAlpha=true,FillIDs=true"
+            feature_gates: "GatewayAlpha=true"
           - name: dbless-rewrite-uris
             test: dbless
             feature_gates: "GatewayAlpha=true,RewriteURIs=true"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -87,6 +87,12 @@ Adding a new version? You'll need three changes:
 - No more "log.SetLogger(...) was never called..." log entry during shutdown of KIC
   [#4738](https://github.com/Kong/kubernetes-ingress-controller/pull/4738)
 
+### Added
+
+- The `FillIDs` feature gate is now enabled by default.
+  [#4746](https://github.com/Kong/kubernetes-ingress-controller/pull/4746)
+
+
 ## 2.12.0
 
 > Release date: 2023-09-25

diff --git a/FEATURE_GATES.md b/FEATURE_GATES.md
@@ -66,6 +66,7 @@ Features that reach GA and over time become stable will be removed from this tab
 | 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 |
+| FillIDs          | `true`  | Beta  | 3.0.0   | TBD   |
 | RewriteURIs      | `false` | Alpha | 2.12.0  | TBD   |
 
 **NOTE**: The `Gateway` feature gate refers to [Gateway

diff --git a/internal/dataplane/kongstate/kongstate.go b/internal/dataplane/kongstate/kongstate.go
@@ -490,7 +490,7 @@ func (ks *KongState) FillIDs(logger logrus.FieldLogger) {
 
 	for consumerIndex, consumer := range ks.Consumers {
 		if err := consumer.FillID(); err != nil {
-			logger.WithError(err).Errorf("failed to fill ID for consumer %s", *consumer.Username)
+			logger.WithError(err).Errorf("failed to fill ID for consumer %s", consumer.FriendlyName())
 		} else {
 			ks.Consumers[consumerIndex] = consumer
 		}

diff --git a/internal/dataplane/parser/parser_test.go b/internal/dataplane/parser/parser_test.go
@@ -5080,12 +5080,12 @@ func TestNewFeatureFlags(t *testing.T) {
 			},
 		},
 		{
-			name: "fill ids enabled",
+			name: "fill ids disabled",
 			featureGates: map[string]bool{
-				featuregates.FillIDsFeature: true,
+				featuregates.FillIDsFeature: false,
 			},
 			expectedFeatureFlags: FeatureFlags{
-				FillIDs: true,
+				FillIDs: false,
 			},
 		},
 	}

diff --git a/internal/dataplane/parser/testdata/golden/consumer-group-example/default_golden.yaml b/internal/dataplane/parser/testdata/golden/consumer-group-example/default_golden.yaml
diff --git a/internal/dataplane/parser/testdata/golden/grpcroute-example/default_golden.yaml b/internal/dataplane/parser/testdata/golden/grpcroute-example/default_golden.yaml
diff --git a/internal/dataplane/parser/testdata/golden/grpcroute-example/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/grpcroute-example/expression-routes-on_golden.yaml
diff --git a/...rnal/dataplane/parser/testdata/golden/grpcroute-example/regex-path-prefix-off_golden.yaml b/...rnal/dataplane/parser/testdata/golden/grpcroute-example/regex-path-prefix-off_golden.yaml
diff --git a/internal/dataplane/parser/testdata/golden/httproute-example/default_golden.yaml b/internal/dataplane/parser/testdata/golden/httproute-example/default_golden.yaml
diff --git a/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml
diff --git a/...al/dataplane/parser/testdata/golden/ingress-v1-empty-path/combined-routes-off_golden.yaml b/...al/dataplane/parser/testdata/golden/ingress-v1-empty-path/combined-routes-off_golden.yaml
diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/default_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/default_golden.yaml
diff --git a/...l/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml b/...l/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml
diff --git a/.../dataplane/parser/testdata/golden/ingress-v1-ingress-class-annotation/default_golden.yaml b/.../dataplane/parser/testdata/golden/ingress-v1-ingress-class-annotation/default_golden.yaml
diff --git a/...testdata/golden/ingress-v1-multiple-ports-for-one-service/combined-routes-off_golden.yaml b/...testdata/golden/ingress-v1-multiple-ports-for-one-service/combined-routes-off_golden.yaml
diff --git a/...lane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/default_golden.yaml b/...lane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/default_golden.yaml
diff --git a/...estdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml b/...estdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml
diff --git a/...e/parser/testdata/golden/ingress-v1-ports-defined-by-name/combined-routes-off_golden.yaml b/...e/parser/testdata/golden/ingress-v1-ports-defined-by-name/combined-routes-off_golden.yaml
diff --git a/...nal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/default_golden.yaml b/...nal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/default_golden.yaml
diff --git a/.../parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml b/.../parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml
diff --git a/...l/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/default_golden.yaml b/...l/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/default_golden.yaml