Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.0] Cherry-pick fixes for v1.0.2 #3593

Merged
merged 15 commits into from
Jun 12, 2024
Merged

[release/v1.0] Cherry-pick fixes for v1.0.2 #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4b7dee4
Use <proto>-<port> for naming service and container ports (#3130)
arkodg Apr 17, 2024
a7a1370
bug: Tests are failing due to an expired certificate in one of the tr…
liorokman May 25, 2024
db87d44
fix: use Patch API for infra-client (#3034)
ardikabs Mar 28, 2024
bad6a5c
refactor: infra client CreateOrUpdate to ServerSideApply (#3134)
ardikabs Apr 9, 2024
b5e0c10
fix: duplicated xroutes are added to gatewayapi.Resources (#3282)
aoledk May 16, 2024
f86cc0f
fix: add proxy protocol always as first listenerFilter (#3332)
zetaab May 6, 2024
21ba18b
fix: security policy reference grant from field type (#3386)
eguzki May 14, 2024
46de4bd
bug: Route extension filters with different types but the same name a…
liorokman May 20, 2024
41f9e37
fix(translator): set ignoreCase for header matchers in extAuth (#3420)
haoqixu May 20, 2024
7bf1f48
fix secrets/configmap updates do not trigger a controller reconcile (…
alexwo May 30, 2024
86bb0cc
feat: backend TLS SAN validation (#3507)
guydc May 31, 2024
9957cb7
fix: ReplaceFullPath not working for root path (/) (#3530)
arkodg Jun 5, 2024
3ad7aa8
chore: Remove namespace restriction for EnvoyProxy parametersRef reso…
phantooom Jun 5, 2024
fc3d0ed
fix test
arkodg Jun 12, 2024
3957d48
fix GatewayInfraResourceTest
arkodg Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/gateway-helm/templates/infra-manager-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ rules:
verbs:
- create
- get
- update
- delete
- patch
- apiGroups:
- apps
resources:
- deployments
verbs:
- create
- get
- update
- delete
- patch
- apiGroups:
- autoscaling
resources:
- horizontalpodautoscalers
verbs:
- create
- get
- update
- delete
- patch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ infraIR:
name: envoy-gateway-system/eg/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 4 additions & 0 deletions internal/gatewayapi/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@ func irUDPListenerName(listener *ListenerContext, udpRoute *UDPRouteContext) str
return fmt.Sprintf("%s/%s/%s/%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, udpRoute.Name)
}

func irListenerPortName(proto ir.ProtocolType, port int32) string {
return strings.ToLower(fmt.Sprintf("%s-%d", proto, port))
}

func irRoutePrefix(route RouteContext) string {
// add a "/" at the end of the prefix to prevent mismatching routes with the
// same prefix. For example, route prefix "/foo/" should not match a route "/foobar".
Expand Down
6 changes: 1 addition & 5 deletions internal/gatewayapi/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,8 @@ func (t *Translator) processInfraIRListener(listener *ListenerContext, infraIR I
proto = ir.UDPProtocolType
}

infraPortName := string(listener.Name)
if t.MergeGateways {
infraPortName = irHTTPListenerName(listener)
}
infraPort := ir.ListenerPort{
Name: infraPortName,
Name: irListenerPortName(proto, servicePort.port),
Protocol: proto,
ServicePort: servicePort.port,
ContainerPort: servicePortToContainerPort(servicePort.port),
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ infraIR:
name: envoy-gateway/gateway-btls/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ infraIR:
name: envoy-gateway/gateway-btls/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ infraIR:
name: envoy-gateway/gateway-btls/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ infraIR:
name: envoy-gateway/gateway-btls/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ infraIR:
name: envoy-gateway/gateway-btls/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
8 changes: 4 additions & 4 deletions internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ infraIR:
name: another-namespace/not-same-namespace-gateway/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -520,7 +520,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -535,14 +535,14 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
- address: null
name: envoy-gateway/gateway-2/tcp
ports:
- containerPort: 10053
name: tcp
name: tcp-53
protocol: TCP
servicePort: 53
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -318,7 +318,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -300,7 +300,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -241,7 +241,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -451,7 +451,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -340,7 +340,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...api/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...ta/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -233,7 +233,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -253,7 +253,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -252,7 +252,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ infraIR:
name: default/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand All @@ -237,7 +237,7 @@ infraIR:
name: envoy-gateway/gateway-2/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ infraIR:
name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http
name: http-80
protocol: HTTP
servicePort: 80
metadata:
Expand Down
Loading