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

Signed-off-by: Charly Molter <charly.molter@konghq.com>
(cherry picked from commit 34c83fb)

# Conflicts:
#	mk/envoy.mk
#	tools/releases/version.sh

mk/envoy.mk

@@ -1,10 +1,15 @@
 KUMA_DIR ?= .
 
 BUILD_ENVOY_FROM_SOURCES ?= false
+<<<<<<< HEAD
 
 ENVOY_TAG ?= v1.21.3 # commit hash or git tag
 # Remember to update pkg/version/compatibility.go
 ENVOY_VERSION = $(shell ${KUMA_DIR}/tools/envoy/version.sh ${ENVOY_TAG})
+=======
+ENVOY_TAG ?= v1.22.7
+ENVOY_ARTIFACT_EXT ?=
+>>>>>>> 34c83fbf1 (chore(deps): bump Envoy from 1.22.2 to 1.22.7 (#5982))
 
 ifeq ($(GOOS),linux)
 	ENVOY_DISTRO ?= alpine

tools/releases/version.sh

@@ -6,13 +6,18 @@
 #     the latest tag with a patch version increased by one (.e.g if latest tag is X.Y.1 the version will be `X.Y.2-<shortHash>`)
 # 3) In non release branch use `0.0.0-$shortHash`
 
+<<<<<<< HEAD
 # Note: this format must be changed carefully, other scripts depend on it
 exactTag=$(git describe --exact-match --tags 2> /dev/null)
 # We only support tags of the format: "v?X.Y.Z(-<alphaNumericName>)?" all other tags will just be ignored and use the regular versioning scheme
 if [[ ${exactTag} =~ ^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?$ ]]; then
   echo "${exactTag/^v//}"
   exit 0
 fi
+=======
+  ENVOY_TAG=${ENVOY_TAG:-"v1.22.7"}
+  ENVOY_VERSION=$(curl --silent --location "https://raw.githubusercontent.com/envoyproxy/envoy/${ENVOY_TAG}/VERSION.txt")
+>>>>>>> 34c83fbf1 (chore(deps): bump Envoy from 1.22.2 to 1.22.7 (#5982))
 
 shortHash=$(git rev-parse --short HEAD 2> /dev/null)
 currentBranch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)