From 6d2b4b059e03a842b7a6aa861fd7043d711d3c9f Mon Sep 17 00:00:00 2001 From: zirain Date: Fri, 28 Feb 2025 12:37:23 +0800 Subject: [PATCH] xds: remove usage of deprecated field exact_match (#5364) * xds: remove usage of deprecated field exact_match Signed-off-by: zirain * fix gen Signed-off-by: zirain --------- Signed-off-by: zirain --- .../testdata/translate/out/default-resources.all.yaml | 8 +++++--- .../translate/out/from-gateway-api-to-xds.all.json | 6 ++++-- .../translate/out/from-gateway-api-to-xds.all.yaml | 5 +++-- .../translate/out/from-gateway-api-to-xds.bootstrap.yaml | 5 +++-- .../out/jwt-single-route-single-match-to-xds.all.json | 6 ++++-- .../out/jwt-single-route-single-match-to-xds.all.yaml | 5 +++-- .../jwt-single-route-single-match-to-xds.bootstrap.yaml | 5 +++-- .../testdata/translate/out/no-service-cluster-ip.all.yaml | 5 +++-- .../kubernetes/proxy/testdata/daemonsets/custom.yaml | 3 ++- .../kubernetes/proxy/testdata/daemonsets/default-env.yaml | 3 ++- .../kubernetes/proxy/testdata/daemonsets/default.yaml | 3 ++- .../proxy/testdata/daemonsets/extension-env.yaml | 3 ++- .../daemonsets/override-labels-and-annotations.yaml | 3 ++- .../proxy/testdata/daemonsets/patch-daemonset.yaml | 3 ++- .../proxy/testdata/daemonsets/shutdown-manager.yaml | 3 ++- .../kubernetes/proxy/testdata/daemonsets/volumes.yaml | 3 ++- .../proxy/testdata/daemonsets/with-annotations.yaml | 3 ++- .../proxy/testdata/daemonsets/with-extra-args.yaml | 3 ++- .../testdata/daemonsets/with-image-pull-secrets.yaml | 3 ++- .../kubernetes/proxy/testdata/daemonsets/with-name.yaml | 3 ++- .../proxy/testdata/daemonsets/with-node-selector.yaml | 3 ++- .../daemonsets/with-topology-spread-constraints.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/custom.yaml | 3 ++- .../testdata/deployments/custom_with_initcontainers.yaml | 3 ++- .../proxy/testdata/deployments/default-env.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/default.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/dual-stack.yaml | 3 ++- .../proxy/testdata/deployments/extension-env.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/ipv6.yaml | 3 ++- .../deployments/override-labels-and-annotations.yaml | 3 ++- .../proxy/testdata/deployments/patch-deployment.yaml | 3 ++- .../proxy/testdata/deployments/shutdown-manager.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/volumes.yaml | 3 ++- .../proxy/testdata/deployments/with-annotations.yaml | 3 ++- .../testdata/deployments/with-empty-memory-limits.yaml | 3 ++- .../proxy/testdata/deployments/with-extra-args.yaml | 3 ++- .../testdata/deployments/with-image-pull-secrets.yaml | 3 ++- .../kubernetes/proxy/testdata/deployments/with-name.yaml | 3 ++- .../proxy/testdata/deployments/with-node-selector.yaml | 3 ++- .../deployments/with-topology-spread-constraints.yaml | 3 ++- internal/xds/bootstrap/bootstrap.yaml.tpl | 3 ++- internal/xds/bootstrap/testdata/merge/default.out.yaml | 5 +++-- .../testdata/merge/merge-user-bootstrap.out.yaml | 5 +++-- .../bootstrap/testdata/merge/patch-global-config.out.yaml | 5 +++-- .../xds/bootstrap/testdata/merge/stats_sinks.out.yaml | 5 +++-- .../xds/bootstrap/testdata/render/custom-server-port.yaml | 3 ++- .../bootstrap/testdata/render/custom-stats-matcher.yaml | 3 ++- .../render/enable-prometheus-gzip-compression.yaml | 3 ++- .../xds/bootstrap/testdata/render/enable-prometheus.yaml | 3 ++- internal/xds/bootstrap/testdata/render/ipv6.yaml | 3 ++- .../testdata/render/with-max-heap-size-bytes.yaml | 3 ++- 51 files changed, 118 insertions(+), 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 index 8119b9530f8..a096767a6fc 100644 --- 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 index 61b8f4a285f..8bdb955ba33 100644 --- 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 index 6db0696366e..32dd0dd76c1 100644 --- 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 index 4b065d6a5d7..ee0f70ead04 100644 --- 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 index 45171a64230..a7fca11c470 100644 --- 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 index 2e209b75dc7..2130457c1bb 100644 --- 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/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml index 46c233dd082..35c5c0bc806 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml +++ b/internal/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 index 89626d7c93b..1d911337ea4 100644 --- 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 index 0cbda3d87b6..7aecef91ab8 100644 --- 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 index 20cfa982155..08d4927aed5 100644 --- 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 index 54c970a7e34..4ad7ab1c55f 100644 --- 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 index 5432f5bdb36..5a6edc87b3c 100644 --- 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/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index 0e29617f61c..5a7a1f5582c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/internal/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 index 640d1ef4d4b..9ce5c762e1f 100644 --- 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 index e4004a9a83e..13fda24aca9 100644 --- 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 index dae8770e9d2..7d34a8482b3 100644 --- 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 index 81e5882b483..be0da3b4da7 100644 --- 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 index 602c3c67a3a..e6dad211fff 100644 --- 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 index d23ecc2b1dc..2b3013b8b3a 100644 --- 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 index 48f9dcfb346..3eb45346e16 100644 --- 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 index c8c0acdf070..e3e5560bdf4 100644 --- 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/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index 3c6d2f97fd6..55a7121947b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/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 index 31c88f5659d..6cbe5ce6bbc 100644 --- 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/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 76e12ffcfde..5b2d77d9720 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/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 index f047ce4d2e0..e7ab25e169b 100644 --- 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 index bda6f6d8a43..f89ea3fbcb2 100644 --- 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 index 32f4b4ad9f6..189b241685d 100644 --- 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 index 6ebfa998944..2eac3726f71 100644 --- 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 index 4b3aee5b595..a22f61810da 100644 --- 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/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index 185c40a2bb6..3e7ae1078ed 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/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 index f0dc3d652f1..643a0bf30f1 100644 --- 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 index 755151222a2..c6525d04230 100644 --- 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 index 846cbfbc1c2..fcbfbfc59f2 100644 --- 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 index 106335bf2b8..c03353fb1d4 100644 --- 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 index e88170b5238..fb49502f82a 100644 --- 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 index 503b2c5ca84..fb1c9f4f1cb 100644 --- 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 index 8ba1d2a3300..caf5d5e1348 100644 --- 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: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 93d2ca99cdb..6f5314ca7eb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.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-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index e2a72aad80c..7992e0b5865 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.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-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 7b64104303b..c38606b38d0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.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/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index cf2110fa86d..32b424f5a16 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -91,7 +91,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats {{- if .EnablePrometheusCompression }} diff --git a/internal/xds/bootstrap/testdata/merge/default.out.yaml b/internal/xds/bootstrap/testdata/merge/default.out.yaml index 61c6e52a750..418698b5e05 100644 --- a/internal/xds/bootstrap/testdata/merge/default.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/default.out.yaml @@ -160,8 +160,9 @@ staticResources: routes: - match: headers: - - exactMatch: GET - name: :method + - name: :method + stringMatch: + exact: GET path: /stats/prometheus route: cluster: prometheus_stats diff --git a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml index b65e510319d..757b2f63774 100644 --- a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml @@ -166,8 +166,9 @@ staticResources: routes: - match: headers: - - exactMatch: GET - name: :method + - name: :method + stringMatch: + exact: GET path: /stats/prometheus route: cluster: prometheus_stats diff --git a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml index d0f094d3531..b462c703674 100644 --- a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml @@ -157,8 +157,9 @@ static_resources: routes: - match: headers: - - exact_match: GET - name: :method + - name: :method + string_match: + exact: GET path: /stats/prometheus route: cluster: prometheus_stats diff --git a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml index 3210ea261cf..605d57fbc5d 100644 --- a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml @@ -177,8 +177,9 @@ staticResources: routes: - match: headers: - - exactMatch: GET - name: :method + - name: :method + stringMatch: + exact: GET path: /stats/prometheus route: cluster: prometheus_stats diff --git a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml index acf4c1e8866..a8f3e3d714a 100644 --- a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml @@ -56,7 +56,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats http_filters: diff --git a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml index 97e3f554d90..39c0ce5644c 100644 --- a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml @@ -67,7 +67,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats http_filters: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml index b2dca3d24de..066049225a0 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml @@ -56,7 +56,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats typed_per_filter_config: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml index c153100cfae..eaad1027890 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml @@ -56,7 +56,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats http_filters: diff --git a/internal/xds/bootstrap/testdata/render/ipv6.yaml b/internal/xds/bootstrap/testdata/render/ipv6.yaml index 7af31a1d32d..9e8423e8b9e 100644 --- a/internal/xds/bootstrap/testdata/render/ipv6.yaml +++ b/internal/xds/bootstrap/testdata/render/ipv6.yaml @@ -57,7 +57,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats http_filters: diff --git a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml index 322d41de108..ae1412d167b 100644 --- a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml +++ b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml @@ -56,7 +56,8 @@ static_resources: path: /stats/prometheus headers: - name: ":method" - exact_match: GET + string_match: + exact: GET route: cluster: prometheus_stats http_filters: