Updates Infra IR Port Naming (#518)

Signed-off-by: danehans <daneyonhansen@gmail.com> Signed-off-by: danehans <daneyonhansen@gmail.com>
envoyproxy · Oct 7, 2022 · bbb89c9 · bbb89c9
1 parent c4fbdc0
commit bbb89c9
Show file tree

Hide file tree

Showing 43 changed files with 220 additions and 45 deletions.
diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml
@@ -81,7 +81,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/...rnal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/...rnal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml
@@ -73,7 +73,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           servicePort: 80
           containerPort: 10080
diff --git a/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml
@@ -89,7 +89,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: tls
               protocol: "HTTPS"
               servicePort: 443
               containerPort: 10443
diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml
@@ -88,7 +88,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: tls
               protocol: "HTTPS"
               servicePort: 443
               containerPort: 10443
diff --git a/...i/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml b/...i/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml
@@ -0,0 +1,52 @@
+gateways:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: Gateway
+    metadata:
+      namespace: envoy-gateway
+      name: gateway-1
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
+        - name: tls
+          protocol: HTTPS
+          port: 443
+          allowedRoutes:
+            namespaces:
+              from: All
+          tls:
+            mode: Terminate
+            certificateRefs:
+              - name: tls-secret-1
+secrets:
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      namespace: envoy-gateway
+      name: tls-secret-1
+    type: kubernetes.io/tls
+    data:
+      tls.crt: Zm9vCg==
+      tls.key: YmFyCg==
+httpRoutes:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: HTTPRoute
+    metadata:
+      namespace: default
+      name: httproute-1
+    spec:
+      parentRefs:
+        - namespace: envoy-gateway
+          name: gateway-1
+      rules:
+        - matches:
+            - path:
+                value: "/"
+          backendRefs:
+            - name: service-1
+              port: 8080
diff --git a/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml
@@ -0,0 +1,127 @@
+gateways:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: Gateway
+    metadata:
+      namespace: envoy-gateway
+      name: gateway-1
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
+        - name: tls
+          protocol: HTTPS
+          port: 443
+          allowedRoutes:
+            namespaces:
+              from: All
+          tls:
+            mode: Terminate
+            certificateRefs:
+              - name: tls-secret-1
+    status:
+      listeners:
+        - name: http
+          supportedKinds:
+            - group: gateway.networking.k8s.io
+              kind: HTTPRoute
+          attachedRoutes: 1
+          conditions:
+            - type: Ready
+              status: "True"
+              reason: Ready
+              message: Listener is ready
+        - name: tls
+          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: default
+      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
+          controllerName: gateway.envoyproxy.io/gatewayclass-controller
+          conditions:
+            - type: Accepted
+              status: "True"
+              reason: Accepted
+              message: Route is accepted
+xdsIR:
+  envoy-gateway-gateway-1:
+    http:
+      - name: envoy-gateway-gateway-1-http
+        address: 0.0.0.0
+        port: 10080
+        hostnames:
+          - "*"
+        routes:
+          - name: default-httproute-1-rule-0-match-0-*
+            pathMatch:
+              prefix: "/"
+            destinations:
+              - host: 7.7.7.7
+                port: 8080
+                weight: 1
+      - name: envoy-gateway-gateway-1-tls
+        address: 0.0.0.0
+        port: 10443
+        hostnames:
+          - "*"
+        tls:
+          serverCertificate: Zm9vCg==
+          privateKey: YmFyCg==
+        routes:
+          - name: default-httproute-1-rule-0-match-0-*
+            pathMatch:
+              prefix: "/"
+            destinations:
+              - host: 7.7.7.7
+                port: 8080
+                weight: 1
+infraIR:
+  envoy-gateway-gateway-1:
+    proxy:
+      metadata:
+        labels:
+          gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
+          gateway.envoyproxy.io/owning-gateway-name: gateway-1
+      name: envoy-gateway-gateway-1
+      image: envoyproxy/envoy:v1.23-latest
+      listeners:
+        - address: ""
+          ports:
+            - name: http
+              protocol: "HTTP"
+              servicePort: 80
+              containerPort: 10080
+            - name: tls
+              protocol: "HTTPS"
+              servicePort: 443
+              containerPort: 10443
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml
@@ -112,7 +112,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http-1
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml
@@ -81,7 +81,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml
@@ -106,7 +106,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http-1
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml
@@ -83,7 +83,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml
@@ -91,7 +91,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml
@@ -94,7 +94,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/...wayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/...wayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml
@@ -83,7 +83,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: envoy-gateway-gateway-1
+            - name: http
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/.../gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/.../gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml
@@ -118,7 +118,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml
@@ -135,7 +135,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/...tewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/...tewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml
@@ -108,7 +108,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml
@@ -101,7 +101,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml
@@ -105,7 +105,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml
@@ -108,7 +108,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml
@@ -108,7 +108,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml
@@ -95,7 +95,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml
@@ -99,7 +99,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml
@@ -100,7 +100,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml
@@ -86,7 +86,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml
@@ -88,7 +88,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80
diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml
@@ -87,7 +87,7 @@ infraIR:
       listeners:
       - address: ""
         ports:
-        - name: envoy-gateway-gateway-1
+        - name: http
           protocol: "HTTP"
           containerPort: 10080
           servicePort: 80