Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release-1.6): upgrade Envoy to 1.21.3 #4457

Merged
merged 1 commit into from
Jun 10, 2022
Merged

chore(release-1.6): upgrade Envoy to 1.21.3 #4457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mk/envoy.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ KUMA_DIR ?= .

BUILD_ENVOY_FROM_SOURCES ?= false

ENVOY_TAG ?= v1.21.1 # commit hash or git tag
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})

Expand Down
8 changes: 1 addition & 7 deletions tools/envoy/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,8 @@ function download_envoy() {
[ -f "${BINARY_PATH}" ] && chmod +x "${BINARY_PATH}"
}

if [[ "${GOARCH}" == "arm64" ]]; then
ARCH="-arm64"
else
ARCH=""
fi

if [[ -n "${ENVOY_VERSION}" ]]; then
BINARY_NAME="envoy-${ENVOY_VERSION}-${ENVOY_DISTRO}${ARCH}"
BINARY_NAME="envoy-${ENVOY_VERSION}-${ENVOY_DISTRO}-${GOARCH}"
download_envoy "${BINARY_NAME}"
exit 0
fi
2 changes: 1 addition & 1 deletion tools/releases/distros.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
ENVOY_VERSION=1.21.3
[ -z "$KUMA_CONFIG_PATH" ] && KUMA_CONFIG_PATH=pkg/config/app/kuma-cp/kuma-cp.defaults.yaml

function get_envoy() {
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1}"
ENVOY_VERSION="${ENVOY_VERSION:-1.21.3}"

function build() {
for component in ${KUMA_COMPONENTS}; do
Expand Down