chore(envoy): update to 1.21.1 (kumahq#3909)

Signed-off-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: Sally Blich <sally.blich@walkme.com>

CHANGELOG.md

@@ -54,7 +54,7 @@ Changes:
 * chore(kuma-cp): consolidate mesh defaults creation [#3678](https://github.com//kumahq/kuma/pull/3678)
 * chore(config): remove ability to disable insights [#3501](https://github.com//kumahq/kuma/pull/3501)
 * chore(*): remove old Ingress [#3435](https://github.com//kumahq/kuma/pull/3435)
-* chore(*): upgrade Envoy to v1.21.0 [#3810](https://github.com//kumahq/kuma/pull/3810)
+* chore(*): upgrade Envoy to v1.21.1 [#3909](https://github.com//kumahq/kuma/pull/3909)
 * chore(grafana): update to latest grafana plugin version [#3812](https://github.com//kumahq/kuma/pull/3812)
 * ci(*): release on every commit in master and release branches [#3712](https://github.com//kumahq/kuma/pull/3712)
 

mk/envoy.mk

@@ -2,7 +2,7 @@ KUMA_DIR ?= .
 
 BUILD_ENVOY_FROM_SOURCES ?= false
 
-ENVOY_TAG ?= v1.21.0 # commit hash or git tag
+ENVOY_TAG ?= v1.21.1 # commit hash or git tag
 # Remember to update pkg/version/compatibility.go
 ENVOY_VERSION = $(shell ${KUMA_DIR}/tools/envoy/version.sh ${ENVOY_TAG})
 

pkg/api-server/testdata/versions.json

@@ -40,10 +40,10 @@
    "envoy": "~1.18.4"
   },
   "~1.5.0": {
-   "envoy": "~1.21.0"
+   "envoy": "~1.21.1"
   },
   "~1.5.0-1-anyprerelease": {
-   "envoy": "~1.21.0"
+   "envoy": "~1.21.1"
   }
  }
 }

pkg/version/compatibility.go

@@ -57,20 +57,20 @@ var CompatibilityMatrix = Compatibility{
 			Envoy: "~1.18.4",
 		},
 		"~1.5.0": {
-			Envoy: "~1.21.0",
+			Envoy: "~1.21.1",
 		},
 		// This includes all dev versions branched from the first release
 		// candidate (i.e. both master and release-1.4)
 		// and all 1.4 releases and RCs. See Masterminds/semver#21
 		"~1.5.0-1-anyprerelease": {
-			Envoy: "~1.21.0",
+			Envoy: "~1.21.1",
 		},
 	},
 }
 
 var DevVersionPrefix = "dev"
 var DevDataplaneCompatibility = DataplaneCompatibility{
-	Envoy: "~1.21.0",
+	Envoy: "~1.21.1",
 }
 
 // DataplaneConstraints returns which Envoy should be used with given version of Kuma.

tools/releases/distros.sh

@@ -15,7 +15,7 @@ PULP_HOST="https://api.pulp.konnect-prod.konghq.com"
 PULP_PACKAGE_TYPE="mesh"
 PULP_DIST_NAME="alpine"
 [ -z "$RELEASE_NAME" ] && RELEASE_NAME="kuma"
-ENVOY_VERSION=1.21.0
+ENVOY_VERSION=1.21.1
 [ -z "$KUMA_CONFIG_PATH" ] && KUMA_CONFIG_PATH=pkg/config/app/kuma-cp/kuma-cp.defaults.yaml
 
 function get_envoy() {

tools/releases/docker.sh

@@ -8,7 +8,7 @@ source "${SCRIPT_DIR}/../common.sh"
 KUMA_DOCKER_REPO="${KUMA_DOCKER_REPO:-docker.io}"
 KUMA_DOCKER_REPO_ORG="${KUMA_DOCKER_REPO_ORG:-${KUMA_DOCKER_REPO}/kumahq}"
 KUMA_COMPONENTS="${KUMA_COMPONENTS:-kuma-cp kuma-dp kumactl kuma-init kuma-prometheus-sd}"
-ENVOY_VERSION="${ENVOY_VERSION:-1.21.0}"
+ENVOY_VERSION="${ENVOY_VERSION:-1.21.1}"
 
 function build() {
   for component in ${KUMA_COMPONENTS}; do