Skip to content

Commit

Permalink
chore(deps): upgrade envoy to 1.24.8 (#6966)
Browse files Browse the repository at this point in the history
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
  • Loading branch information
lukidzi authored Jun 20, 2023
1 parent 8248e12 commit 66b8e45
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 425 deletions.
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
18 changes: 18 additions & 0 deletions mk/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ GOARCH := $(shell go env GOARCH)
CGO_ENABLED := 0
GOFLAGS :=

ENVOY_DISTRO ?= $(GOOS)

TOP := $(shell pwd)
BUILD_DIR ?= $(TOP)/build
BUILD_ARTIFACTS_DIR ?= $(BUILD_DIR)/artifacts-${GOOS}-${GOARCH}
Expand Down Expand Up @@ -106,6 +108,14 @@ 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 && \
if [ ! -f $(BUILD_ARTIFACTS_DIR)/envoy/envoy-$(ENVOY_DISTRO) ]; then \
curl -s --fail --location https://github.com/kumahq/envoy-builds/releases/download/v$(ENVOY_VERSION)/envoy-$(ENVOY_DISTRO)-$(GOARCH)-v$(ENVOY_VERSION)$(ENVOY_EXT_$(GOOS)_$(GOARCH)).tar.gz | tar -C $(BUILD_ARTIFACTS_DIR)/envoy -xz; \
mv $(BUILD_ARTIFACTS_DIR)/envoy/envoy $(BUILD_ARTIFACTS_DIR)/envoy/envoy-$(ENVOY_DISTRO); \
fi

.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 +188,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.

4 changes: 2 additions & 2 deletions test/dockerfiles/Dockerfile.universal
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG BASE_IMAGE_ARCH
FROM --platform=linux/${BASE_IMAGE_ARCH} ubuntu:22.04
ARG ENVOY_DISTRO=linux

RUN mkdir /kuma
RUN echo "# use this file to override default configuration of \`kuma-cp\`" > /kuma/kuma-cp.conf \
Expand Down Expand Up @@ -33,11 +34,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-${ENVOY_DISTRO} /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

0 comments on commit 66b8e45

Please sign in to comment.