Updates Infra IR to Support Multiple Envoy Services

internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml

@@ -76,9 +76,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml

@@ -68,9 +68,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-    - address: ""
+    - name: envoy-gateway-gateway-1
+      address: ""
       ports:
-      - name: envoy-gateway-gateway-1
+      - name: http
         protocol: "HTTP"
         servicePort: 80
         containerPort: 10080

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml

@@ -68,4 +68,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml

@@ -66,4 +66,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml

@@ -66,4 +66,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml

@@ -66,4 +66,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml

@@ -64,4 +64,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml

@@ -70,4 +70,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml

@@ -71,4 +71,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml

@@ -70,4 +70,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml

@@ -62,4 +62,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml

@@ -84,9 +84,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: tls
             protocol: "HTTPS"
             servicePort: 443
             containerPort: 10443

internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml

@@ -63,4 +63,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml

@@ -83,9 +83,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: tls
             protocol: "HTTPS"
             servicePort: 443
             containerPort: 10443

internal/gatewayapi/testdata/gateway-with-two-listeners-with-different-port-and-hostname.in.yaml

@@ -0,0 +1,50 @@
+gateways:
+- apiVersion: gateway.networking.k8s.io/v1beta1
+  kind: Gateway
+  metadata:
+    namespace: envoy-gateway
+    name: gateway-1
+  spec:
+    gatewayClassName: envoy-gateway-class
+    listeners:
+    - name: http-1
+      protocol: HTTP
+      port: 80
+      hostname: foo.com
+      allowedRoutes:
+        namespaces:
+          from: Same
+    - name: http-2
+      protocol: HTTP
+      port: 81
+      hostname: bar.com
+      allowedRoutes:
+        namespaces:
+          from: Same
+httpRoutes:
+- apiVersion: gateway.networking.k8s.io/v1beta1
+  kind: HTTPRoute
+  metadata:
+    namespace: envoy-gateway
+    name: httproute-1
+  spec:
+    parentRefs:
+    - namespace: envoy-gateway
+      name: gateway-1
+    rules:
+    - matches:
+      - path:
+          value: "/"
+      backendRefs:
+      - name: service-1
+        port: 8080
+services:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    namespace: envoy-gateway
+    name: service-1
+  spec:
+    clusterIP: 7.7.7.7
+    ports:
+      - port: 8080

internal/gatewayapi/testdata/gateway-with-two-listeners-with-different-port-and-hostname.out.yaml

@@ -0,0 +1,119 @@
+gateways:
+- apiVersion: gateway.networking.k8s.io/v1beta1
+  kind: Gateway
+  metadata:
+    namespace: envoy-gateway
+    name: gateway-1
+  spec:
+    gatewayClassName: envoy-gateway-class
+    listeners:
+    - name: http-1
+      protocol: HTTP
+      port: 80
+      hostname: foo.com
+      allowedRoutes:
+        namespaces:
+          from: Same
+    - name: http-2
+      protocol: HTTP
+      port: 81
+      hostname: bar.com
+      allowedRoutes:
+        namespaces:
+          from: Same
+  status:
+    listeners:
+      - name: http-1
+        supportedKinds:
+          - group: gateway.networking.k8s.io
+            kind: HTTPRoute
+        attachedRoutes: 1
+        conditions:
+          - type: Ready
+            status: "True"
+            reason: Ready
+            message: Listener is ready
+      - name: http-2
+        supportedKinds:
+          - group: gateway.networking.k8s.io
+            kind: HTTPRoute
+        attachedRoutes: 1
+        conditions:
+          - type: Ready
+            status: "True"
+            reason: Ready
+            message: Listener is ready
+httpRoutes:
+- apiVersion: gateway.networking.k8s.io/v1beta1
+  kind: HTTPRoute
+  metadata:
+    namespace: envoy-gateway
+    name: httproute-1
+  spec:
+    parentRefs:
+      - namespace: envoy-gateway
+        name: gateway-1
+    rules:
+      - matches:
+          - path:
+              value: "/"
+        backendRefs:
+          - name: service-1
+            port: 8080
+  status:
+    parents:
+      - parentRef:
+          namespace: envoy-gateway
+          name: gateway-1
+        conditions:
+          - type: Accepted
+            status: "True"
+            reason: Accepted
+            message: Route is accepted
+xdsIR:
+  http:
+    - name: envoy-gateway-gateway-1-http-1
+      address: 0.0.0.0
+      port: 10080
+      hostnames:
+        - "foo.com"
+      routes:
+        - name: envoy-gateway-httproute-1-rule-0-match-0-foo.com
+          pathMatch:
+            prefix: "/"
+          destinations:
+            - host: 7.7.7.7
+              port: 8080
+              weight: 1
+    - name: envoy-gateway-gateway-1-http-2
+      address: 0.0.0.0
+      port: 10081
+      hostnames:
+        - "bar.com"
+      routes:
+        - name: envoy-gateway-httproute-1-rule-0-match-0-bar.com
+          pathMatch:
+            prefix: "/"
+          destinations:
+            - host: 7.7.7.7
+              port: 8080
+              weight: 1
+infraIR:
+  proxy:
+    metadata:
+      labels:
+        gateway.envoyproxy.io/owning-gatewayclass: envoy-gateway-class
+    name: envoy-gateway-class
+    image: envoyproxy/envoy:v1.23-latest
+    listeners:
+    - name: envoy-gateway-gateway-1
+      address: ""
+      ports:
+        - name: http-1
+          protocol: "HTTP"
+          servicePort: 80
+          containerPort: 10080
+        - name: http-2
+          protocol: "HTTP"
+          servicePort: 81
+          containerPort: 10081

internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml

@@ -86,4 +86,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-    - address: ""
+    - name: envoy-gateway-gateway-1
+      address: ""

internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml

@@ -86,4 +86,5 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""

internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml

@@ -107,9 +107,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http-1
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml

@@ -76,9 +76,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml

@@ -101,9 +101,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http-1
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml

@@ -78,9 +78,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml

@@ -86,9 +86,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml

@@ -89,9 +89,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080

internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml

@@ -78,9 +78,10 @@ infraIR:
     name: envoy-gateway-class
     image: envoyproxy/envoy:v1.23-latest
     listeners:
-      - address: ""
+      - name: envoy-gateway-gateway-1
+        address: ""
         ports:
-          - name: envoy-gateway-gateway-1
+          - name: http
             protocol: "HTTP"
             servicePort: 80
             containerPort: 10080