Update test to include all of the policy types

Signed-off-by: Lior Okman <[email protected]>
envoyproxy · Feb 24, 2024 · d3e0134 · d3e0134
1 parent 3628a85
commit d3e0134
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 0 deletions.
diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml
@@ -266,6 +266,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway-2
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml
@@ -252,6 +252,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway-1
       hostnames:
       - '*'
       isHTTP2: true
@@ -291,6 +292,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway-2
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml
@@ -85,6 +85,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml
@@ -122,6 +122,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway
       hostnames:
       - '*'
       isHTTP2: false
@@ -134,6 +135,7 @@ xdsIR:
         http:
           requestReceivedTimeout: 5s
     - address: 0.0.0.0
+      gatewayName: envoy-gateway/gateway
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/...estdata/merge-with-securitypolicy.in.yaml → ...data/merge-with-isolated-policies.in.yaml b/...estdata/merge-with-securitypolicy.in.yaml → ...data/merge-with-isolated-policies.in.yaml
@@ -99,3 +99,34 @@ securityPolicies:
           - "x-header-7"
           - "x-header-8"
         maxAge: 2000s
+clientTrafficPolicies:
+  - apiVersion: gateway.envoyproxy.io/v1alpha1
+    kind: ClientTrafficPolicy
+    metadata:
+      namespace: default
+      name: target-gateway
+    spec:
+      targetRef:
+        group: gateway.networking.k8s.io
+        kind: Gateway
+        name: gateway-2
+        namespace: default
+      timeout:
+        http:
+          requestReceivedTimeout: "5s"
+backendTrafficPolicies:
+- apiVersion: gateway.envoyproxy.io/v1alpha1
+  kind: BackendTrafficPolicy
+  metadata:
+    namespace: default
+    name: policy-for-gateway
+  spec:
+    targetRef:
+      group: gateway.networking.k8s.io
+      kind: Gateway
+      name: gateway-1
+      namespace: default
+    tcpKeepalive:
+      probes: 3
+      idleTime: 20m
+      interval: 60s
diff --git a/...stdata/merge-with-securitypolicy.out.yaml → ...ata/merge-with-isolated-policies.out.yaml b/...stdata/merge-with-securitypolicy.out.yaml → ...ata/merge-with-isolated-policies.out.yaml
@@ -222,6 +222,52 @@ securityPolicies:
       reason: Accepted
       status: "True"
       type: Accepted
+clientTrafficPolicies:
+- apiVersion: gateway.envoyproxy.io/v1alpha1
+  kind: ClientTrafficPolicy
+  metadata:
+    namespace: default
+    name: target-gateway
+  spec:
+    targetRef:
+      group: gateway.networking.k8s.io
+      kind: Gateway
+      name: gateway-2
+      namespace: default
+    timeout:
+      http:
+        requestReceivedTimeout: "5s"
+  status:
+    conditions:
+    - lastTransitionTime: null
+      message: ClientTrafficPolicy has been accepted.
+      reason: Accepted
+      status: "True"
+      type: Accepted
+backendTrafficPolicies:
+- apiVersion: gateway.envoyproxy.io/v1alpha1
+  kind: BackendTrafficPolicy
+  metadata:
+    creationTimestamp: null
+    name: policy-for-gateway
+    namespace: default
+  spec:
+    targetRef:
+      group: gateway.networking.k8s.io
+      kind: Gateway
+      name: gateway-1
+      namespace: default
+    tcpKeepalive:
+      idleTime: 20m
+      interval: 60s
+      probes: 3
+  status:
+    conditions:
+    - lastTransitionTime: null
+      message: BackendTrafficPolicy has been accepted.
+      reason: Accepted
+      status: "True"
+      type: Accepted
 xdsIR:
   envoy-gateway-class:
     accessLog:
@@ -272,6 +318,10 @@ xdsIR:
           distinct: false
           name: ""
           prefix: /
+        tcpKeepalive:
+          idleTime: 1200
+          interval: 60
+          probes: 3
     - address: 0.0.0.0
       gatewayName: default/gateway-2
       hostnames:
@@ -282,6 +332,9 @@ xdsIR:
         escapedSlashesAction: UnescapeAndRedirect
         mergeSlashes: true
       port: 8888
+      timeout:
+        http:
+          requestReceivedTimeout: 5s
       routes:
       - backendWeights:
           invalid: 0