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.

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(deps): upgrade envoy to 1.24.8 #6966

Merged
merged 5 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ include mk/kind.mk
include mk/k3d.mk
include mk/e2e.new.mk
include mk/docs.mk
include mk/envoy.mk
14 changes: 14 additions & 0 deletions mk/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ else
echo "CoreDNS is already built. If you want to rebuild it, remove the binary: rm $(BUILD_ARTIFACTS_DIR)/coredns/coredns"
endif

.PHONY: build/envoy
build/envoy:
mkdir -p $(BUILD_ARTIFACTS_DIR)/envoy && \
[ -f $(BUILD_ARTIFACTS_DIR)/envoy/envoy ] || \
curl -s --fail --location https://github.com/kumahq/envoy-builds/releases/download/v$(ENVOY_VERSION)/envoy-$(GOOS)-$(GOARCH)-v$(ENVOY_VERSION)$(ENVOY_EXT_$(GOOS)_$(GOARCH)).tar.gz | tar -C $(BUILD_ARTIFACTS_DIR)/envoy -xz

.PHONY: build/kuma-prometheus-sd
build/kuma-prometheus-sd: ## Dev: Build `kuma-prometheus-sd` binary
$(Build_Go_Application) ./app/$(notdir $@)
Expand Down Expand Up @@ -178,6 +184,14 @@ build/test-server/linux-amd64:
build/test-server/linux-arm64:
GOOS=linux GOARCH=arm64 $(MAKE) build/test-server

.PHONY: build/envoy/linux-amd64
build/envoy/linux-amd64:
GOOS=linux GOARCH=amd64 $(MAKE) build/envoy

.PHONY: build/envoy/linux-arm64
build/envoy/linux-arm64:
GOOS=linux GOARCH=arm64 $(MAKE) build/envoy

.PHONY: clean
clean: clean/build ## Dev: Clean

Expand Down
2 changes: 1 addition & 1 deletion mk/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ image/kuma-cp: build/kuma-cp/linux-${GOARCH} ## Dev: Rebuild `kuma-cp` Docker im
docker build -t $(KUMA_CP_DOCKER_IMAGE) ${DOCKER_BUILD_ARGS} --build-arg ARCH=${GOARCH} --build-arg BASE_IMAGE_ARCH=${GOARCH} -f tools/releases/dockerfiles/Dockerfile.kuma-cp .

.PHONY: image/kuma-dp
image/kuma-dp: build/kuma-dp/linux-${GOARCH} build/coredns/linux-${GOARCH} build/artifacts-linux-${GOARCH}/envoy/envoy ## Dev: Rebuild `kuma-dp` Docker image
image/kuma-dp: build/kuma-dp/linux-${GOARCH} build/coredns/linux-${GOARCH} build/envoy/linux-${GOARCH} ## Dev: Rebuild `kuma-dp` Docker image
docker build -t $(KUMA_DP_DOCKER_IMAGE) ${DOCKER_BUILD_ARGS} --build-arg ARCH=${GOARCH} --build-arg BASE_IMAGE_ARCH=${GOARCH} --build-arg ENVOY_VERSION=${ENVOY_VERSION} -f tools/releases/dockerfiles/Dockerfile.kuma-dp .

.PHONY: image/kumactl
Expand Down
58 changes: 0 additions & 58 deletions mk/envoy.mk

This file was deleted.

3 changes: 1 addition & 2 deletions test/dockerfiles/Dockerfile.universal
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ RUN ssh-keygen -A \
&& useradd -U kuma-dp

ARG ARCH
ARG ENVOY_VERSION

ADD /build/artifacts-linux-$ARCH/kuma-cp/kuma-cp /usr/bin
ADD /build/artifacts-linux-$ARCH/kuma-dp/kuma-dp /usr/bin
ADD /build/artifacts-linux-$ARCH/envoy/envoy-$ENVOY_VERSION-alpine /usr/bin/envoy
ADD /build/artifacts-linux-$ARCH/envoy/envoy /usr/bin/envoy
ADD /build/artifacts-linux-$ARCH/coredns/coredns /usr/bin
ADD /build/artifacts-linux-$ARCH/kumactl/kumactl /usr/bin
ADD /build/artifacts-linux-$ARCH/test-server/test-server /usr/bin
Expand Down
10 changes: 0 additions & 10 deletions tools/envoy/Dockerfile.build-centos

This file was deleted.

3 changes: 0 additions & 3 deletions tools/envoy/Dockerfile.build-centos.dockerignore

This file was deleted.

16 changes: 0 additions & 16 deletions tools/envoy/Dockerfile.build-ubuntu

This file was deleted.

3 changes: 0 additions & 3 deletions tools/envoy/Dockerfile.build-ubuntu.dockerignore

This file was deleted.

44 changes: 0 additions & 44 deletions tools/envoy/README.md

This file was deleted.

40 changes: 0 additions & 40 deletions tools/envoy/build_centos.sh

This file was deleted.

35 changes: 0 additions & 35 deletions tools/envoy/build_darwin.sh

This file was deleted.

42 changes: 0 additions & 42 deletions tools/envoy/build_linux.sh

This file was deleted.

17 changes: 0 additions & 17 deletions tools/envoy/contrib_enabled_matrix.py

This file was deleted.

48 changes: 0 additions & 48 deletions tools/envoy/fetch.sh

This file was deleted.

Loading