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.

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

chore: replace targetRef with targetRefs in e2e #3858

Merged
merged 4 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions test/e2e/testdata/authorization-client-ip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ metadata:
name: authorization-client-ip-1
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-authorization-client-ip-1
authorization:
Expand Down Expand Up @@ -68,8 +68,8 @@ metadata:
name: authorization-client-ip-2
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-authorization-client-ip-2
authorization:
Expand All @@ -92,7 +92,7 @@ spec:
clientIPDetection:
xForwardedFor:
numTrustedHops: 1
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
8 changes: 4 additions & 4 deletions test/e2e/testdata/authorization-default-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ metadata:
name: authorization-empty
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-authorization-empty
authorization: {} # An empty authorization policy means deny all since default action is deny
Expand All @@ -50,8 +50,8 @@ metadata:
name: authorization-allow-all
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-authorization-allow-all
authorization: # Allow all since default action is allow and no rules are defined
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/testdata/backend-health-check-active-http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-health-check-active-http-pass
namespace: gateway-conformance-infra
healthCheck:
active:
timeout: 3s
Expand All @@ -31,7 +30,6 @@ spec:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-health-check-active-http-fail
namespace: gateway-conformance-infra
healthCheck:
active:
timeout: 3s
Expand Down Expand Up @@ -89,7 +87,6 @@ spec:
group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
namespace: gateway-conformance-infra
type: JSONPatch
jsonPatches:
- type: "type.googleapis.com/envoy.config.cluster.v3.Cluster"
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/testdata/backend-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: backend-upgrade-example
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-backend-upgrade
namespace: gateway-conformance-infra
circuitBreaker:
maxParallelRequests: 10000
maxConnections: 10000
Expand Down
9 changes: 4 additions & 5 deletions test/e2e/testdata/basic-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ metadata:
name: basic-auth-1
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-basic-auth-1
namespace: gateway-conformance-infra
basicAuth:
users:
name: "basic-auth-users-secret-1"
Expand All @@ -70,8 +69,8 @@ metadata:
name: basic-auth-2
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-basic-auth-2
basicAuth:
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/testdata/circuitbreaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: circuitbreaker-example
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-circuitbreaker
namespace: gateway-conformance-infra
circuitBreaker:
maxConnections: 0
maxParallelRequests: 0
Expand Down
16 changes: 8 additions & 8 deletions test/e2e/testdata/client-timeout.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ metadata:
name: client-timeout
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-client-timeout
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-client-timeout
faultInjection:
delay:
fixedDelay: 100ms
Expand All @@ -18,10 +18,10 @@ metadata:
name: client-timeout
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
targetRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
timeout:
http:
requestReceivedTimeout: 50ms
Expand Down
9 changes: 4 additions & 5 deletions test/e2e/testdata/connection-limit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: connection-limit-ctp
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: Gateway
name: connection-limit-gateway
namespace: gateway-conformance-infra
targetRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: connection-limit-gateway
connection:
connectionLimit:
value: 3
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/testdata/cors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: cors-example
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-cors
namespace: gateway-conformance-infra
cors:
allowOrigins:
- "https://www.foo.com"
Expand Down
1 change: 0 additions & 1 deletion test/e2e/testdata/envoy-patch-policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
namespace: gateway-conformance-infra
type: JSONPatch
jsonPatches:
- type: "type.googleapis.com/envoy.config.listener.v3.Listener"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ metadata:
name: ext-auth-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-ext-auth
extAuth:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/testdata/ext-auth-http-securitypolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ metadata:
name: ext-auth-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-ext-auth
extAuth:
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/testdata/ext-proc-envoyextensionpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ metadata:
name: ext-proc-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-ext-proc
extProc:
Expand All @@ -60,8 +60,8 @@ metadata:
name: ext-proc-no-procmode-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-without-procmode
extProc:
Expand Down Expand Up @@ -122,8 +122,8 @@ metadata:
name: ext-proc-uds-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-extproc-uds-tls
extProc:
Expand Down
18 changes: 8 additions & 10 deletions test/e2e/testdata/fault-injection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: fault-injection-abort
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-fault-abort
namespace: gateway-conformance-infra
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-fault-abort
faultInjection:
abort:
httpStatus: 501
Expand All @@ -19,11 +18,10 @@ metadata:
name: fault-injection-abort-and-delay
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-route-delayandabort
namespace: gateway-conformance-infra
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-route-delayandabort
faultInjection:
delay:
fixedDelay: 2s
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/testdata/jwt-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ metadata:
name: jwt-optional
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: HTTPRoute
name: jwt-optional
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: jwt-optional
jwt:
providers:
- name: example
Expand Down
9 changes: 4 additions & 5 deletions test/e2e/testdata/listener-health-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: health-check-ctp
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
namespace: gateway-conformance-infra
targetRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
healthCheck:
path: /ready
---
Expand Down
10 changes: 4 additions & 6 deletions test/e2e/testdata/local-ratelimit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: ratelimit-specific-user
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-ratelimit-specific-user
namespace: gateway-conformance-infra
rateLimit:
type: Local
local:
Expand All @@ -30,11 +29,10 @@ metadata:
name: ratelimit-all-traffic
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-ratelimit-all-traffic
namespace: gateway-conformance-infra
rateLimit:
type: Local
local:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/testdata/oidc-securitypolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ metadata:
name: oidc-test
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-with-oidc
oidc:
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/testdata/preserve-case.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ metadata:
name: preserve-case
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: same-namespace
namespace: gateway-conformance-infra
http1:
preserveHeaderCase: true
---
Expand Down
10 changes: 4 additions & 6 deletions test/e2e/testdata/ratelimit-based-jwt-claims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ metadata:
name: jwt-example
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-ratelimit-based-jwt-claims
namespace: gateway-conformance-infra
jwt:
providers:
- name: example
Expand All @@ -24,11 +23,10 @@ metadata:
name: ratelimit-specific-user
namespace: gateway-conformance-infra
spec:
targetRef:
group: gateway.networking.k8s.io
targetRefs:
- group: gateway.networking.k8s.io
kind: HTTPRoute
name: http-ratelimit-based-jwt-claims
namespace: gateway-conformance-infra
rateLimit:
type: Global
global:
Expand Down
Loading