Adds Initial Infra IR Support to Resource Translator (#188)

Adds Infra IR to Resource Translator Signed-off-by: danehans <[email protected]> Signed-off-by: danehans <[email protected]>
envoyproxy · Aug 11, 2022 · 6c4bf9b · 6c4bf9b
1 parent 3003c65
commit 6c4bf9b
Show file tree

Hide file tree

Showing 38 changed files with 405 additions and 113 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
@@ -53,7 +53,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
@@ -66,3 +66,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+        - name: envoy-gateway-gateway-1
+          port: 80
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
@@ -53,8 +53,18 @@ httpRoutes:
               status: "False"
               reason: NotAllowedByListeners
               message: No listeners included by this parent ref allowed this attachment.
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/...tewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/...tewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml
@@ -59,4 +59,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/...rnal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml b/...rnal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml
@@ -57,4 +57,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml
@@ -57,4 +57,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/...ayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/...ayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml
@@ -57,4 +57,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/...estdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/...estdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml
@@ -55,4 +55,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/...tdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/...tdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml
@@ -61,4 +61,15 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
+
diff --git a/...a/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/...a/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml
@@ -62,4 +62,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/...estdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/...estdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml
@@ -61,4 +61,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/...tewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/...tewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml
@@ -53,4 +53,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
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
@@ -58,7 +58,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-tls
       address: 0.0.0.0
@@ -74,3 +74,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml
@@ -54,4 +54,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
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
@@ -57,7 +57,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-tls
       address: 0.0.0.0
@@ -73,3 +73,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 443
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml
@@ -77,4 +77,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/...api/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/...api/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml
@@ -77,4 +77,14 @@ httpRoutes:
               status: "False"
               reason: NoReadyListeners
               message: There are no ready listeners for this parent ref
-ir: {}
+xdsIR: {}
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
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
@@ -71,7 +71,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http-1
       address: 0.0.0.0
@@ -99,3 +99,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml
@@ -53,7 +53,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
@@ -66,3 +66,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
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
@@ -73,7 +73,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http-1
       address: 0.0.0.0
@@ -93,3 +93,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml
@@ -55,7 +55,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
@@ -68,3 +68,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80
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
@@ -57,7 +57,7 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
-ir:
+xdsIR:
   http:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
@@ -76,3 +76,13 @@ ir:
             - host: 7.7.7.7
               port: 8080
               weight: 1
+infraIR:
+  provider: Kubernetes
+  proxy:
+    name: envoy-gateway-class
+    image: envoyproxy/envoy-dev:latest
+    listeners:
+      - address: ""
+        ports:
+          - name: envoy-gateway-gateway-1
+            port: 80