Skip to content

Commit a5dfcf1

Browse files
committed
enable KongCustomEntity by default
1 parent 8b9fbc1 commit a5dfcf1

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ Adding a new version? You'll need three changes:
145145
of them. Increased individual readiness check timeout from 1s to 5s.
146146
[#6347](https://github.com/Kong/kubernetes-ingress-controller/pull/6347)
147147
[#6357](https://github.com/Kong/kubernetes-ingress-controller/pull/6357)
148+
- Promote `KongCustomEntity` feature gate to beta thus it is enabled by default.
149+
[#6387](https://github.com/Kong/kubernetes-ingress-controller/pull/6387)
148150

149151
## 3.2.3
150152

FEATURE_GATES.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ Features that reach GA and over time become stable will be removed from this tab
7171
| KongServiceFacade | `false` | Alpha | 3.1.0 | TBD |
7272
| SanitizeKonnectConfigDumps | `true` | Beta | 3.1.0 | TBD |
7373
| FallbackConfiguration | `false` | Alpha | 3.2.0 | TBD |
74-
| KongCustomEntity | `false` | Alpha | 3.2.0 | TBD |
74+
| KongCustomEntity | `false` | Alpha | 3.2.0 | 3.3.0 |
75+
| KongCustomEntity | `true` | Beta | 3.3.0 | TBD |
7576

7677
**NOTE**: The `Gateway` feature gate refers to [Gateway
7778
API](https://github.com/kubernetes-sigs/gateway-api) APIs which are in

internal/dataplane/testdata/golden/fallback-config-kong-custom-entities-ee/default_golden.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
_format_version: "3.0"
2+
degraphql_routes:
3+
- query: query{ contacts { name } }
4+
uri: /contacts
5+
- query: query{ contacts { name } }
6+
uri: /contacts
27
plugins:
38
- config:
49
graphql_server_path: /v1/graphql

internal/dataplane/testdata/golden/kong-custom-entity-ee/default_golden.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
_format_version: "3.0"
2+
degraphql_routes:
3+
- query: query{ contacts { name } }
4+
service:
5+
id: 9e262d22-26f2-5bcb-8d57-c5229fb8c5a2
6+
uri: /contacts
27
services:
38
- connect_timeout: 60000
49
host: s1.default.80.svc

internal/manager/featuregates/feature_gates.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ const (
3535
// KongCustomEntity is the name of the feature-gate for enabling KongCustomEntity CR reconciliation
3636
// for configuring custom Kong entities that KIC does not support yet.
3737
// Requires feature gate `FillIDs` to be enabled.
38-
// TODO: enable the feature gate by default when ready:
39-
// https://github.com/Kong/kubernetes-ingress-controller/issues/6124
4038
KongCustomEntity = "KongCustomEntity"
4139

4240
// DocsURL provides a link to the documentation for feature gates in the KIC repository.
@@ -85,6 +83,6 @@ func GetFeatureGatesDefaults() FeatureGates {
8583
KongServiceFacade: false,
8684
SanitizeKonnectConfigDumps: true,
8785
FallbackConfiguration: false,
88-
KongCustomEntity: false,
86+
KongCustomEntity: true,
8987
}
9088
}

test/envtest/telemetry_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func verifyTelemetryReport(t *testing.T, k8sVersion *version.Info, report string
360360
"feature-fillids=true;"+
361361
"feature-gateway-service-discovery=false;"+
362362
"feature-gatewayalpha=false;"+
363-
"feature-kongcustomentity=false;"+
363+
"feature-kongcustomentity=true;"+
364364
"feature-kongservicefacade=false;"+
365365
"feature-konnect-sync=false;"+
366366
"feature-rewriteuris=false;"+

0 commit comments

Comments
 (0)