chore: replace targetRef with targetRefs in e2e (#3858)

envoyproxy · Jul 15, 2024 · 222d74d · 222d74d
1 parent d0daf1f
commit 222d74d
Show file tree

Hide file tree

Showing 32 changed files with 98 additions and 121 deletions.
diff --git a/test/e2e/testdata/authorization-client-ip.yaml b/test/e2e/testdata/authorization-client-ip.yaml
@@ -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:
@@ -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:
@@ -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
diff --git a/test/e2e/testdata/authorization-default-action.yaml b/test/e2e/testdata/authorization-default-action.yaml
@@ -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
@@ -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

diff --git a/test/e2e/testdata/backend-health-check-active-http.yaml b/test/e2e/testdata/backend-health-check-active-http.yaml
@@ -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
@@ -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
@@ -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"

diff --git a/test/e2e/testdata/backend-upgrade.yaml b/test/e2e/testdata/backend-upgrade.yaml
@@ -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

diff --git a/test/e2e/testdata/basic-auth.yaml b/test/e2e/testdata/basic-auth.yaml
@@ -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"
@@ -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:

diff --git a/test/e2e/testdata/circuitbreaker.yaml b/test/e2e/testdata/circuitbreaker.yaml
@@ -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

diff --git a/test/e2e/testdata/client-timeout.yaml b/test/e2e/testdata/client-timeout.yaml
@@ -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
@@ -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

diff --git a/test/e2e/testdata/connection-limit.yaml b/test/e2e/testdata/connection-limit.yaml
@@ -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

diff --git a/test/e2e/testdata/cors.yaml b/test/e2e/testdata/cors.yaml
@@ -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"

diff --git a/test/e2e/testdata/envoy-patch-policy.yaml b/test/e2e/testdata/envoy-patch-policy.yaml
@@ -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"

diff --git a/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml b/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml
@@ -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:

diff --git a/test/e2e/testdata/ext-auth-http-securitypolicy.yaml b/test/e2e/testdata/ext-auth-http-securitypolicy.yaml
@@ -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:

diff --git a/test/e2e/testdata/ext-proc-envoyextensionpolicy.yaml b/test/e2e/testdata/ext-proc-envoyextensionpolicy.yaml
@@ -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:
@@ -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:
@@ -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:

diff --git a/test/e2e/testdata/fault-injection.yaml b/test/e2e/testdata/fault-injection.yaml
@@ -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
@@ -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

diff --git a/test/e2e/testdata/jwt-optional.yaml b/test/e2e/testdata/jwt-optional.yaml
@@ -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

diff --git a/test/e2e/testdata/listener-health-check.yaml b/test/e2e/testdata/listener-health-check.yaml
@@ -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
 ---

diff --git a/test/e2e/testdata/local-ratelimit.yaml b/test/e2e/testdata/local-ratelimit.yaml
@@ -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:
@@ -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:

diff --git a/test/e2e/testdata/oidc-securitypolicy.yaml b/test/e2e/testdata/oidc-securitypolicy.yaml
@@ -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:

diff --git a/test/e2e/testdata/preserve-case.yaml b/test/e2e/testdata/preserve-case.yaml
@@ -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
 ---

diff --git a/test/e2e/testdata/ratelimit-based-jwt-claims.yaml b/test/e2e/testdata/ratelimit-based-jwt-claims.yaml
@@ -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
@@ -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: