Merge commit from fork

Signed-off-by: Guy Daich <guy.daich@sap.com>
envoyproxy · Jan 23, 2025 · 1f3185d · 1f3185d
1 parent 24873a4
commit 1f3185d
Show file tree

Hide file tree

Showing 57 changed files with 272 additions and 53 deletions.
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -52,6 +52,7 @@ envoyProxyForGatewayClass:
                 typed_config:
                   "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                   stat_prefix: eg-ready-http
+                  normalize_path: true
                   route_config:
                     name: local_route
                     virtual_hosts:
@@ -60,7 +61,10 @@ envoyProxyForGatewayClass:
                       - "*"
                       routes:
                       - match:
-                          prefix: /stats/prometheus
+                          path: /stats/prometheus
+                          headers:
+                          - name: ":method"
+                            exact_match: GET
                         route:
                           cluster: prometheus_stats
                   http_filters:
@@ -677,6 +681,7 @@ xds:
                   - name: envoy.filters.http.router
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                  normalizePath: true
                   routeConfig:
                     name: local_route
                     virtualHosts:
@@ -685,7 +690,10 @@ xds:
                       name: prometheus_stats
                       routes:
                       - match:
-                          prefix: /stats/prometheus
+                          headers:
+                          - exactMatch: GET
+                            name: :method
+                          path: /stats/prometheus
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -268,6 +268,7 @@
                                 }
                               }
                             ],
+                            "normalizePath": true,
                             "routeConfig": {
                               "name": "local_route",
                               "virtualHosts": [
@@ -279,7 +280,13 @@
                                   "routes": [
                                     {
                                       "match": {
-                                        "prefix": "/stats/prometheus"
+                                        "headers": [
+                                          {
+                                            "exactMatch": "GET",
+                                            "name": ":method"
+                                          }
+                                        ],
+                                        "path": "/stats/prometheus"
                                       },
                                       "route": {
                                         "cluster": "prometheus_stats"

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -156,6 +156,7 @@ xds:
                   - name: envoy.filters.http.router
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                  normalizePath: true
                   routeConfig:
                     name: local_route
                     virtualHosts:
@@ -164,7 +165,10 @@ xds:
                       name: prometheus_stats
                       routes:
                       - match:
-                          prefix: /stats/prometheus
+                          headers:
+                          - exactMatch: GET
+                            name: :method
+                          path: /stats/prometheus
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
@@ -155,6 +155,7 @@ xds:
                 - name: envoy.filters.http.router
                   typedConfig:
                     '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                normalizePath: true
                 routeConfig:
                   name: local_route
                   virtualHosts:
@@ -163,7 +164,10 @@ xds:
                     name: prometheus_stats
                     routes:
                     - match:
-                        prefix: /stats/prometheus
+                        headers:
+                        - exactMatch: GET
+                          name: :method
+                        path: /stats/prometheus
                       route:
                         cluster: prometheus_stats
                 statPrefix: eg-ready-http

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
@@ -268,6 +268,7 @@
                                 }
                               }
                             ],
+                            "normalizePath": true,
                             "routeConfig": {
                               "name": "local_route",
                               "virtualHosts": [
@@ -279,7 +280,13 @@
                                   "routes": [
                                     {
                                       "match": {
-                                        "prefix": "/stats/prometheus"
+                                        "headers": [
+                                          {
+                                            "exactMatch": "GET",
+                                            "name": ":method"
+                                          }
+                                        ],
+                                        "path": "/stats/prometheus"
                                       },
                                       "route": {
                                         "cluster": "prometheus_stats"

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
@@ -156,6 +156,7 @@ xds:
                   - name: envoy.filters.http.router
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                  normalizePath: true
                   routeConfig:
                     name: local_route
                     virtualHosts:
@@ -164,7 +165,10 @@ xds:
                       name: prometheus_stats
                       routes:
                       - match:
-                          prefix: /stats/prometheus
+                          headers:
+                          - exactMatch: GET
+                            name: :method
+                          path: /stats/prometheus
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http

diff --git a/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml
@@ -155,6 +155,7 @@ xds:
                 - name: envoy.filters.http.router
                   typedConfig:
                     '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                normalizePath: true
                 routeConfig:
                   name: local_route
                   virtualHosts:
@@ -163,7 +164,10 @@ xds:
                     name: prometheus_stats
                     routes:
                     - match:
-                        prefix: /stats/prometheus
+                        headers:
+                        - exactMatch: GET
+                          name: :method
+                        path: /stats/prometheus
                       route:
                         cluster: prometheus_stats
                 statPrefix: eg-ready-http

diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
@@ -156,6 +156,7 @@ xds:
                   - name: envoy.filters.http.router
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                  normalizePath: true
                   routeConfig:
                     name: local_route
                     virtualHosts:
@@ -164,7 +165,10 @@ xds:
                       name: prometheus_stats
                       routes:
                       - match:
-                          prefix: /stats/prometheus
+                          headers:
+                          - exactMatch: GET
+                            name: :method
+                          path: /stats/prometheus
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -84,6 +84,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -92,7 +93,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
@@ -79,6 +79,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
@@ -92,6 +92,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -100,7 +101,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
@@ -88,6 +88,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -96,7 +97,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
@@ -83,6 +83,7 @@ spec:
                   typed_config:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: eg-ready-http
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
@@ -91,7 +92,10 @@ spec:
                         - "*"
                         routes:
                         - match:
-                            prefix: /stats/prometheus
+                            path: /stats/prometheus
+                            headers:
+                            - name: ":method"
+                              exact_match: GET
                           route:
                             cluster: prometheus_stats
                     http_filters: