From 6d0b84e66f178dab4a3eb44c18d4a0d354a3d82b Mon Sep 17 00:00:00 2001 From: Charly Molter Date: Wed, 23 Feb 2022 12:51:08 +0100 Subject: [PATCH 1/2] chore(envoy): update to 1.21.1 Signed-off-by: Charly Molter --- mk/envoy.mk | 2 +- pkg/api-server/testdata/versions.json | 4 ++-- pkg/version/compatibility.go | 6 +++--- tools/releases/distros.sh | 2 +- tools/releases/docker.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mk/envoy.mk b/mk/envoy.mk index 005dc95bd083..f59adf97433a 100644 --- a/mk/envoy.mk +++ b/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}) diff --git a/pkg/api-server/testdata/versions.json b/pkg/api-server/testdata/versions.json index ab79155a03b0..9bddd7ed4f1a 100644 --- a/pkg/api-server/testdata/versions.json +++ b/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" } } } diff --git a/pkg/version/compatibility.go b/pkg/version/compatibility.go index e315a6874a41..2d4f8585bad3 100644 --- a/pkg/version/compatibility.go +++ b/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. diff --git a/tools/releases/distros.sh b/tools/releases/distros.sh index d3f6b9d1521c..3ccc0aaab921 100755 --- a/tools/releases/distros.sh +++ b/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() { diff --git a/tools/releases/docker.sh b/tools/releases/docker.sh index a7e81551890e..536daaee01d9 100755 --- a/tools/releases/docker.sh +++ b/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 From 0045208f8de1c5fd8269264c443351a45e66d11e Mon Sep 17 00:00:00 2001 From: Charly Molter Date: Wed, 23 Feb 2022 12:53:28 +0100 Subject: [PATCH 2/2] chore(changelog): update changelog with envoy update Signed-off-by: Charly Molter --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ab7d76725ec..073c55481db4 100644 --- a/CHANGELOG.md +++ b/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)