Skip to content

feat: invalid listener should not block IR #8194

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

Open
zirain wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: invalid listener should not block IR #8194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions internal/gatewayapi/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
t.validateHostName(listener)

// Process conditions and check if the listener is ready
isReady := t.validateListenerConditions(listener)
if !isReady {
continue
}
t.validateListenerConditions(listener)

address := netutils.IPv4ListenerAddress
ipFamily := getEnvoyIPFamily(gateway.envoyProxy)
Expand Down
57 changes: 57 additions & 0 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 @@ -508,6 +508,12 @@ infraIR:
name: http-80
protocol: HTTP
servicePort: 80
- name: envoy-gateway/gateway-2/https
ports:
- containerPort: 10443
name: https-443
protocol: HTTPS
servicePort: 443
- name: envoy-gateway/gateway-2/tcp
ports:
- containerPort: 10053
Expand Down Expand Up @@ -729,6 +735,57 @@ xdsIR:
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/*
traffic: {}
- address: 0.0.0.0
externalPort: 443
hostnames:
- '*'
isHTTP2: true
metadata:
kind: Gateway
name: gateway-2
namespace: envoy-gateway
sectionName: https
name: envoy-gateway/gateway-2/https
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10443
routes:
- destination:
metadata:
kind: GRPCRoute
name: grpcroute-1
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0
settings:
- addressType: IP
endpoints:
- host: 7.7.7.7
port: 8080
metadata:
kind: Service
name: service-1
namespace: envoy-gateway
sectionName: "8080"
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/backend/0
protocol: GRPC
weight: 1
headerMatches:
- distinct: false
exact: foo
name: magic
hostname: '*'
isHTTP2: true
metadata:
kind: GRPCRoute
name: grpcroute-1
namespace: envoy-gateway
policies:
- kind: BackendTrafficPolicy
name: target-grpcroute-in-gateway-2
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/*
traffic: {}
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
21 changes: 21 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,12 @@ infraIR:
name: http-80
protocol: HTTP
servicePort: 80
- name: envoy-gateway/gateway-2/https
ports:
- containerPort: 10443
name: https-443
protocol: HTTPS
servicePort: 443
- name: envoy-gateway/gateway-2/tcp
ports:
- containerPort: 10053
Expand Down Expand Up @@ -592,6 +598,21 @@ xdsIR:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10080
- address: 0.0.0.0
externalPort: 443
hostnames:
- '*'
isHTTP2: false
metadata:
kind: Gateway
name: gateway-2
namespace: envoy-gateway
sectionName: https
name: envoy-gateway/gateway-2/https
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10443
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
53 changes: 53 additions & 0 deletions internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,12 @@ infraIR:
name: http-80
protocol: HTTP
servicePort: 80
- name: envoy-gateway/gateway-2/https
ports:
- containerPort: 10443
name: https-443
protocol: HTTPS
servicePort: 443
- name: envoy-gateway/gateway-2/tcp
ports:
- containerPort: 10053
Expand Down Expand Up @@ -721,6 +727,53 @@ xdsIR:
name: grpcroute-1
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/*
- address: 0.0.0.0
externalPort: 443
hostnames:
- '*'
isHTTP2: true
metadata:
kind: Gateway
name: gateway-2
namespace: envoy-gateway
sectionName: https
name: envoy-gateway/gateway-2/https
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10443
routes:
- destination:
metadata:
kind: GRPCRoute
name: grpcroute-1
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0
settings:
- addressType: IP
endpoints:
- host: 7.7.7.7
port: 8080
metadata:
kind: Service
name: service-1
namespace: envoy-gateway
sectionName: "8080"
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/backend/0
protocol: GRPC
weight: 1
envoyExtensions: {}
headerMatches:
- distinct: false
exact: foo
name: magic
hostname: '*'
isHTTP2: true
metadata:
kind: GRPCRoute
name: grpcroute-1
namespace: envoy-gateway
name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/*
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
23 changes: 23 additions & 0 deletions ...tewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ httpRoutes:
infraIR:
envoy-gateway/gateway-1:
proxy:
listeners:
- name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http-80
protocol: HTTP
servicePort: 80
metadata:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
Expand Down Expand Up @@ -113,6 +120,22 @@ xdsIR:
sectionName: "8080"
name: envoy-gateway/gateway-1
protocol: TCP
http:
- address: 0.0.0.0
externalPort: 80
hostnames:
- '*'
isHTTP2: false
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10080
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
23 changes: 23 additions & 0 deletions ...rnal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ httpRoutes:
infraIR:
envoy-gateway/gateway-1:
proxy:
listeners:
- name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http-80
protocol: HTTP
servicePort: 80
metadata:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
Expand Down Expand Up @@ -104,6 +111,22 @@ xdsIR:
sectionName: "8080"
name: envoy-gateway/gateway-1
protocol: TCP
http:
- address: 0.0.0.0
externalPort: 80
hostnames:
- '*'
isHTTP2: false
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10080
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
23 changes: 23 additions & 0 deletions ...pi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ httpRoutes:
infraIR:
envoy-gateway/gateway-1:
proxy:
listeners:
- name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http-80
protocol: HTTP
servicePort: 80
metadata:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
Expand Down Expand Up @@ -106,6 +113,22 @@ xdsIR:
sectionName: "8080"
name: envoy-gateway/gateway-1
protocol: TCP
http:
- address: 0.0.0.0
externalPort: 80
hostnames:
- '*'
isHTTP2: false
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10080
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
23 changes: 23 additions & 0 deletions internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ httpRoutes:
infraIR:
envoy-gateway/gateway-1:
proxy:
listeners:
- name: envoy-gateway/gateway-1/http
ports:
- containerPort: 10080
name: http-80
protocol: HTTP
servicePort: 80
metadata:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
Expand Down Expand Up @@ -104,6 +111,22 @@ xdsIR:
sectionName: "8080"
name: envoy-gateway/gateway-1
protocol: TCP
http:
- address: 0.0.0.0
externalPort: 80
hostnames:
- '*'
isHTTP2: false
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
path:
escapedSlashesAction: UnescapeAndRedirect
mergeSlashes: true
port: 10080
readyListener:
address: 0.0.0.0
ipFamily: IPv4
Expand Down
17 changes: 17 additions & 0 deletions ...al/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ gateways:
infraIR:
envoy-gateway/gateway-1:
proxy:
listeners:
- name: envoy-gateway/gateway-1/tls
ports:
- containerPort: 10080
name: tls-80
protocol: TLS
servicePort: 80
metadata:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
Expand Down Expand Up @@ -109,3 +116,13 @@ xdsIR:
ipFamily: IPv4
path: /ready
port: 19003
tcp:
- address: 0.0.0.0
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tls
name: envoy-gateway/gateway-1/tls
port: 10080
Loading