chore(deps): bump Envoy from 1.22.2 to 1.22.7 (backport #5982)

mk/build.mk

@@ -1,13 +1,12 @@
-BUILD_INFO_GIT_TAG ?= $(shell git describe --tags 2>/dev/null || echo unknown)
-BUILD_INFO_GIT_COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null || echo unknown)
-BUILD_INFO_BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ" || echo unknown)
-BUILD_INFO_VERSION ?= $(shell $(TOOLS_DIR)/releases/version.sh)
+build_info := $(shell $(TOOLS_DIR)/releases/version.sh)
+BUILD_INFO_VERSION ?= $(word 1, $(build_info))
 
 build_info_fields := \
 	version=$(BUILD_INFO_VERSION) \
-	gitTag=$(BUILD_INFO_GIT_TAG) \
-	gitCommit=$(BUILD_INFO_GIT_COMMIT) \
-	buildDate=$(BUILD_INFO_BUILD_DATE)
+	gitTag=$(word 2, $(build_info)) \
+	gitCommit=$(word 3, $(build_info)) \
+	buildDate=$(word 4, $(build_info)) \
+	Envoy=$(word 5, $(build_info))
 build_info_ld_flags := $(foreach entry,$(build_info_fields), -X github.com/kumahq/kuma/pkg/version.$(entry))
 
 LD_FLAGS := -ldflags="-s -w $(build_info_ld_flags) $(EXTRA_LD_FLAGS)"

mk/envoy.mk

@@ -1,6 +1,8 @@
 KUMA_DIR ?= .
 
 BUILD_ENVOY_FROM_SOURCES ?= false
+ENVOY_TAG ?= v1.22.7
+ENVOY_ARTIFACT_EXT ?=
 
 ENVOY_TAG ?= v1.21.3 # commit hash or git tag
 # Remember to update pkg/version/compatibility.go
@@ -45,8 +47,9 @@ ifeq ($(BUILD_ENVOY_FROM_SOURCES),true)
 	BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS} \
 	BINARY_PATH=$@ ${KUMA_DIR}/tools/envoy/build_${ENVOY_DISTRO}.sh
 else
-	ENVOY_VERSION=${ENVOY_VERSION} \
+	ENVOY_TAG=$(ENVOY_TAG) \
 	ENVOY_DISTRO=${ENVOY_DISTRO} \
+	ENVOY_ARTIFACT_EXT=${ENVOY_ARTIFACT_EXT} \
 	BINARY_PATH=$@ ${KUMA_DIR}/tools/envoy/fetch.sh
 endif
 

pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml

@@ -32,6 +32,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:

pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml

@@ -32,6 +32,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:
@@ -85,6 +87,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:

pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml

@@ -32,6 +32,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:

pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml

@@ -41,6 +41,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:

pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml

@@ -39,6 +39,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:
@@ -101,6 +103,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:
@@ -163,6 +167,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:
@@ -223,6 +229,8 @@ Resources:
               responseDirectionConfig:
                 disableOnEtagHeader: true
           - name: envoy.filters.http.router
+            typedConfig:
+              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
           mergeSlashes: true
           normalizePath: true
           rds:

pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml

@@ -109,6 +109,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml

@@ -37,6 +37,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml

@@ -109,6 +109,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml

@@ -166,6 +166,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml

@@ -166,6 +166,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml

@@ -163,6 +163,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml

@@ -184,6 +184,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml

@@ -77,6 +77,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml

@@ -89,6 +89,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml

@@ -166,6 +166,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml

@@ -166,6 +166,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml

@@ -123,6 +123,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml

@@ -102,6 +102,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml

@@ -88,6 +88,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml

@@ -80,6 +80,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml

@@ -87,6 +87,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml

@@ -116,6 +116,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds:

pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml

@@ -44,6 +44,8 @@ Listeners:
                 responseDirectionConfig:
                   disableOnEtagHeader: true
             - name: envoy.filters.http.router
+              typedConfig:
+                '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             mergeSlashes: true
             normalizePath: true
             rds: