xds: remove usage of deprecated field exact_match (#5364)

* xds: remove usage of deprecated field exact_match Signed-off-by: zirain <[email protected]> * fix gen Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]>
envoyproxy · Feb 28, 2025 · 6d2b4b0 · 6d2b4b0
1 parent c4bc5b2
commit 6d2b4b0
Show file tree

Hide file tree

Showing 51 changed files with 118 additions and 64 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
@@ -65,7 +65,8 @@ envoyProxyForGatewayClass:
                           path: /stats/prometheus
                           headers:
                           - name: ":method"
-                            exact_match: GET
+                            string_match:
+                              exact: GET
                         route:
                           cluster: prometheus_stats
                   http_filters:
@@ -711,8 +712,9 @@ xds:
                       routes:
                       - match:
                           headers:
-                          - exactMatch: GET
-                            name: :method
+                          - name: :method
+                            stringMatch:
+                              exact: GET
                           path: /stats/prometheus
                         route:
                           cluster: prometheus_stats

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,8 +268,10 @@
                                       "match": {
                                         "headers": [
                                           {
-                                            "exactMatch": "GET",
-                                            "name": ":method"
+                                            "name": ":method",
+                                            "stringMatch": {
+                                              "exact": "GET"
+                                            }
                                           }
                                         ],
                                         "path": "/stats/prometheus"

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
@@ -159,8 +159,9 @@ xds:
                       routes:
                       - match:
                           headers:
-                          - exactMatch: GET
-                            name: :method
+                          - name: :method
+                            stringMatch:
+                              exact: GET
                           path: /stats/prometheus
                         route:
                           cluster: prometheus_stats

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
@@ -158,8 +158,9 @@ xds:
                     routes:
                     - match:
                         headers:
-                        - exactMatch: GET
-                          name: :method
+                        - name: :method
+                          stringMatch:
+                            exact: GET
                         path: /stats/prometheus
                       route:
                         cluster: prometheus_stats

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,8 +268,10 @@
                                       "match": {
                                         "headers": [
                                           {
-                                            "exactMatch": "GET",
-                                            "name": ":method"
+                                            "name": ":method",
+                                            "stringMatch": {
+                                              "exact": "GET"
+                                            }
                                           }
                                         ],
                                         "path": "/stats/prometheus"

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
@@ -159,8 +159,9 @@ xds:
                       routes:
                       - match:
                           headers:
-                          - exactMatch: GET
-                            name: :method
+                          - name: :method
+                            stringMatch:
+                              exact: GET
                           path: /stats/prometheus
                         route:
                           cluster: prometheus_stats

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
@@ -158,8 +158,9 @@ xds:
                     routes:
                     - match:
                         headers:
-                        - exactMatch: GET
-                          name: :method
+                        - name: :method
+                          stringMatch:
+                            exact: GET
                         path: /stats/prometheus
                       route:
                         cluster: prometheus_stats

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
@@ -159,8 +159,9 @@ xds:
                       routes:
                       - match:
                           headers:
-                          - exactMatch: GET
-                            name: :method
+                          - name: :method
+                            stringMatch:
+                              exact: GET
                           path: /stats/prometheus
                         route:
                           cluster: prometheus_stats

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -97,7 +97,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -105,7 +105,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: 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
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/...infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/...infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml
@@ -96,7 +96,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
@@ -102,7 +102,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
@@ -102,7 +102,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
@@ -109,7 +109,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
@@ -101,7 +101,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
@@ -105,7 +105,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
@@ -100,7 +100,8 @@ spec:
                             path: /stats/prometheus
                             headers:
                             - name: ":method"
-                              exact_match: GET
+                              string_match:
+                                exact: GET
                           route:
                             cluster: prometheus_stats
                     http_filters: