chore(deps): upgrade envoy to 1.25.7

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
kumahq · Jun 7, 2023 · b9e3b86 · b9e3b86
1 parent f3f0d4c
commit b9e3b86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/mk/envoy.mk b/mk/envoy.mk
@@ -1,5 +1,4 @@
 BUILD_ENVOY_FROM_SOURCES ?= false
-ENVOY_TAG ?= v1.22.10
 ENVOY_ARTIFACT_EXT ?=
 
 ifeq ($(GOOS),linux)
@@ -46,7 +45,7 @@ ifeq ($(BUILD_ENVOY_FROM_SOURCES),true)
 	BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS} \
 	BINARY_PATH=$@ $(BUILD_ENVOY_SCRIPT)
 else
-	ENVOY_TAG=$(ENVOY_TAG) \
+	ENVOY_TAG=$(ENVOY_VERSION) \
 	ENVOY_DISTRO=${ENVOY_DISTRO} \
 	ENVOY_ARTIFACT_EXT=${ENVOY_ARTIFACT_EXT} \
 	BINARY_PATH=$@ ${KUMA_DIR}/tools/envoy/fetch.sh

diff --git a/tools/releases/version.sh b/tools/releases/version.sh
@@ -8,11 +8,7 @@ function envoy_version() {
   # - if ENVOY_TAG is a real git tag like 'v1.20.0' then the version is equal to '1.20.0' (without the first letter 'v').
   # - if ENVOY_TAG is a commit hash then the version will look like '1.20.1-dev-b16d390f'
 
-<<<<<<< HEAD
-  ENVOY_TAG=${ENVOY_TAG:-"v1.22.10"}
-=======
-  ENVOY_TAG=${ENVOY_TAG:-"v1.26.2"}
->>>>>>> 28a441aac (chore(deps): upgrade envoy version to 1.26.2 (#6938))
+  ENVOY_TAG=${ENVOY_TAG:-"v1.25.7"}
   ENVOY_VERSION=$(curl --silent --location "https://raw.githubusercontent.com/envoyproxy/envoy/${ENVOY_TAG}/VERSION.txt")
 
   # for envoy versions older than v1.22.0 file 'VERSION.txt' used to be called 'VERSION'