Skip to content

Commit bd8cc04

Browse files
zhaohuabingrajsinghtechwoodgearzirainsudiptob2
authored
[release-1.6] cherry-pick for v1.6.1 (#7664)
* fix: oidc authentication endpoint was overwritten by discovered value (#7460) fix: oid authentication endpoint was overriden by discovered value Signed-off-by: Huabing Zhao <[email protected]> Signed-off-by: Huabing (Robin) Zhao <[email protected]> (cherry picked from commit 50dcb15) Signed-off-by: Huabing Zhao <[email protected]> * fix: do not return 500 for all requests when part of BackendRefs are invalid (#7488) * do not return 500 for all requests when part of BackendRefs are invalid Signed-off-by: Huabing Zhao <[email protected]> Signed-off-by: Huabing (Robin) Zhao <[email protected]> (cherry picked from commit 2899416) Signed-off-by: Huabing Zhao <[email protected]> * fix: prevent skeleton route status entries for unmanaged GatewayClasses (#7536) * fix: prevent skeleton route status entries for unmanaged GatewayClasses When processing policies (EnvoyExtensionPolicy, SecurityPolicy), the translator was calling GetRouteParentContext for ALL parentRefs in a route, even those referencing gateways with different GatewayClasses not managed by this translator. GetRouteParentContext creates a skeleton RouteParentStatus entry with just the controllerName when called on a parentRef that hasn't been processed yet. Since all GatewayClass instances share the same controller name, these skeleton entries persisted in status without conditions. The fix checks if a parentRef context already exists before attempting to apply policy configuration to it. If the context doesn't exist, it means this parentRef wasn't processed by this translator and should be skipped. Signed-off-by: Raj Singh <[email protected]> * fix: also prevent skeleton entries in BackendTrafficPolicy processing The same issue exists in BackendTrafficPolicy route processing - calling GetRouteParentContext for all parentRefs creates skeleton status entries. Apply the same fix: check if parentRef context exists before adding to list. Signed-off-by: Raj Singh <[email protected]> --------- Signed-off-by: Raj Singh <[email protected]> (cherry picked from commit ff13742) Signed-off-by: Huabing Zhao <[email protected]> * treat too many addresses as programmed (#7542) Signed-off-by: cong <[email protected]> (cherry picked from commit 7cb5f72) Signed-off-by: Huabing Zhao <[email protected]> * bechmark: fix cpu sampling (#7581) use fixed duration for cpu rate Signed-off-by: Huabing Zhao <[email protected]> (cherry picked from commit 536486f) Signed-off-by: Huabing Zhao <[email protected]> * chore: bump golang.org/x/crypto (#7588) * chore: bump golang.org/x/crypto Signed-off-by: zirain <[email protected]> * fix gen Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> (cherry picked from commit 70fa59a) Signed-off-by: Huabing Zhao <[email protected]> * findOwningGateway should return controller based on linked GatewayClass (#7611) * fix: filter Gateway by controller in findOwningGateway Prevent cross-controller Gateway mutations by validating GatewayClass Signed-off-by: Sudipto Baral <[email protected]> (cherry picked from commit ba8e0e2) Signed-off-by: Huabing Zhao <[email protected]> * fix: use default when namespace is unset (#7612) * fix: use default when namespace is unset Signed-off-by: zirain <[email protected]> * fix Signed-off-by: zirain <[email protected]> * fix test Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> (cherry picked from commit be2cc73) Signed-off-by: Huabing Zhao <[email protected]> * bump Gateway API v1.4.1 (#7653) Signed-off-by: zirain <[email protected]> (cherry picked from commit 0fa26d7) Signed-off-by: Huabing Zhao <[email protected]> * update release note Signed-off-by: Huabing Zhao <[email protected]> * fix gen check Signed-off-by: Huabing Zhao <[email protected]> * ci: add script to free disk space (#7534) * feat: free disk space Signed-off-by: Shreemaan Abhishek <[email protected]> * lint Signed-off-by: Shreemaan Abhishek <[email protected]> * cleanup Signed-off-by: Shreemaan Abhishek <[email protected]> * make target and tools/hack Signed-off-by: Shreemaan Abhishek <[email protected]> * lint Signed-off-by: Shreemaan Abhishek <[email protected]> * modular action Signed-off-by: Shreemaan Abhishek <[email protected]> --------- Signed-off-by: Shreemaan Abhishek <[email protected]> (cherry picked from commit 4312f38) Signed-off-by: Huabing Zhao <[email protected]> --------- Signed-off-by: Huabing Zhao <[email protected]> Signed-off-by: Huabing (Robin) Zhao <[email protected]> Signed-off-by: Raj Singh <[email protected]> Signed-off-by: cong <[email protected]> Signed-off-by: zirain <[email protected]> Signed-off-by: Sudipto Baral <[email protected]> Signed-off-by: Shreemaan Abhishek <[email protected]> Co-authored-by: Raj Singh <[email protected]> Co-authored-by: 聪 <[email protected]> Co-authored-by: zirain <[email protected]> Co-authored-by: Sudipto Baral <[email protected]> Co-authored-by: shreealt <[email protected]>
1 parent 62dbfcb commit bd8cc04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2501
-623
lines changed

‎.github/workflows/build_and_test.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ jobs:
208208
steps:
209209
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
210210
- uses: ./tools/github-actions/setup-deps
211+
- uses: ./tools/github-actions/reclaim-storage
211212

212213
- name: Download EG Binaries
213214
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0

‎charts/gateway-crds-helm/templates/experimental-gatewayapi-crds.yaml‎

Lines changed: 254 additions & 90 deletions
Large diffs are not rendered by default.

‎charts/gateway-crds-helm/templates/standard-gatewayapi-crds.yaml‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kind: CustomResourceDefinition
2525
metadata:
2626
annotations:
2727
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
28-
gateway.networking.k8s.io/bundle-version: v1.4.0
28+
gateway.networking.k8s.io/bundle-version: v1.4.1
2929
gateway.networking.k8s.io/channel: standard
3030
labels:
3131
gateway.networking.k8s.io/policy: Direct
@@ -130,6 +130,12 @@ spec:
130130
implementation MUST ensure the `Accepted` Condition is set to
131131
`status: False`, with Reason `Conflicted`.
132132

133+
Implementations SHOULD NOT support more than one targetRef at this
134+
time. Although the API technically allows for this, the current guidance
135+
for conflict resolution and status handling is lacking. Until that can be
136+
clarified in a future release, the safest approach is to support a single
137+
targetRef.
138+
133139
Support: Extended for Kubernetes Service
134140

135141
Support: Implementation-specific for any other resource
@@ -775,6 +781,12 @@ spec:
775781
implementation MUST ensure the `Accepted` Condition is set to
776782
`status: False`, with Reason `Conflicted`.
777783

784+
Implementations SHOULD NOT support more than one targetRef at this
785+
time. Although the API technically allows for this, the current guidance
786+
for conflict resolution and status handling is lacking. Until that can be
787+
clarified in a future release, the safest approach is to support a single
788+
targetRef.
789+
778790
Support: Extended for Kubernetes Service
779791

780792
Support: Implementation-specific for any other resource
@@ -1332,6 +1344,8 @@ spec:
13321344
type: object
13331345
served: false
13341346
storage: false
1347+
subresources:
1348+
status: {}
13351349
status:
13361350
acceptedNames:
13371351
kind: ""
@@ -1347,7 +1361,7 @@ kind: CustomResourceDefinition
13471361
metadata:
13481362
annotations:
13491363
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1350-
gateway.networking.k8s.io/bundle-version: v1.4.0
1364+
gateway.networking.k8s.io/bundle-version: v1.4.1
13511365
gateway.networking.k8s.io/channel: standard
13521366
name: gatewayclasses.gateway.networking.k8s.io
13531367
spec:
@@ -1866,7 +1880,7 @@ kind: CustomResourceDefinition
18661880
metadata:
18671881
annotations:
18681882
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1869-
gateway.networking.k8s.io/bundle-version: v1.4.0
1883+
gateway.networking.k8s.io/bundle-version: v1.4.1
18701884
gateway.networking.k8s.io/channel: standard
18711885
name: gateways.gateway.networking.k8s.io
18721886
spec:
@@ -4123,7 +4137,7 @@ kind: CustomResourceDefinition
41234137
metadata:
41244138
annotations:
41254139
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
4126-
gateway.networking.k8s.io/bundle-version: v1.4.0
4140+
gateway.networking.k8s.io/bundle-version: v1.4.1
41274141
gateway.networking.k8s.io/channel: standard
41284142
name: grpcroutes.gateway.networking.k8s.io
41294143
spec:
@@ -6197,7 +6211,7 @@ kind: CustomResourceDefinition
61976211
metadata:
61986212
annotations:
61996213
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
6200-
gateway.networking.k8s.io/bundle-version: v1.4.0
6214+
gateway.networking.k8s.io/bundle-version: v1.4.1
62016215
gateway.networking.k8s.io/channel: standard
62026216
name: httproutes.gateway.networking.k8s.io
62036217
spec:
@@ -7073,6 +7087,9 @@ spec:
70737087
enum:
70747088
- 301
70757089
- 302
7090+
- 303
7091+
- 307
7092+
- 308
70767093
type: integer
70777094
type: object
70787095
responseHeaderModifier:
@@ -8007,6 +8024,9 @@ spec:
80078024
enum:
80088025
- 301
80098026
- 302
8027+
- 303
8028+
- 307
8029+
- 308
80108030
type: integer
80118031
type: object
80128032
responseHeaderModifier:
@@ -9882,6 +9902,9 @@ spec:
98829902
enum:
98839903
- 301
98849904
- 302
9905+
- 303
9906+
- 307
9907+
- 308
98859908
type: integer
98869909
type: object
98879910
responseHeaderModifier:
@@ -10816,6 +10839,9 @@ spec:
1081610839
enum:
1081710840
- 301
1081810841
- 302
10842+
- 303
10843+
- 307
10844+
- 308
1081910845
type: integer
1082010846
type: object
1082110847
responseHeaderModifier:
@@ -11844,7 +11870,7 @@ kind: CustomResourceDefinition
1184411870
metadata:
1184511871
annotations:
1184611872
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
11847-
gateway.networking.k8s.io/bundle-version: v1.4.0
11873+
gateway.networking.k8s.io/bundle-version: v1.4.1
1184811874
gateway.networking.k8s.io/channel: standard
1184911875
name: referencegrants.gateway.networking.k8s.io
1185011876
spec:

0 commit comments

Comments
 (0)