From cd0eb099325163898b195ff86190e9d5bfbe68fb Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Wed, 3 May 2023 10:01:55 +0100 Subject: [PATCH 1/2] bump to latest go version Signed-off-by: Ashley Davis --- make/tools.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 50e3f33ab..d38cf56b3 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -53,7 +53,7 @@ KUBEBUILDER_ASSETS_VERSION=1.26.1 TOOLS += etcd=$(KUBEBUILDER_ASSETS_VERSION) TOOLS += kube-apiserver=$(KUBEBUILDER_ASSETS_VERSION) -VENDORED_GO_VERSION := 1.20.3 +VENDORED_GO_VERSION := 1.20.4 # When switching branches which use different versions of the tools, we # need a way to re-trigger the symlinking from $(BINDIR)/downloaded to $(BINDIR)/tools. @@ -486,4 +486,4 @@ go-workspace: export GOWORK?=$(abspath go.work) go-workspace: @rm -f $(GOWORK) go work init - go work use . ./cmd/acmesolver ./cmd/cainjector ./cmd/controller ./cmd/ctl ./cmd/webhook ./test/integration ./test/e2e \ No newline at end of file + go work use . ./cmd/acmesolver ./cmd/cainjector ./cmd/controller ./cmd/ctl ./cmd/webhook ./test/integration ./test/e2e From cd3194c1b523afabb91306a67dc120d5e84bd9b0 Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Wed, 3 May 2023 10:02:51 +0100 Subject: [PATCH 2/2] bump base images to latest available Signed-off-by: Ashley Davis --- make/base_images.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/make/base_images.mk b/make/base_images.mk index dc033f6ae..ef876927e 100644 --- a/make/base_images.mk +++ b/make/base_images.mk @@ -1,12 +1,12 @@ # +skip_license_check # autogenerated by hack/latest-base-images.sh -STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static@sha256:8d4cc4a622ce09a75bd7b1eea695008bdbff9e91fea426c2d353ea127dcdc9e3 -STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static@sha256:c98239bd892490f2ab1f29c5321613eedbb9b96863b3109b93e14de7641ea97a -STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static@sha256:8bf5eed87652c8c97b4bea6bfab4c7162f3dad09381bd160ddc8f8853fc6bbce -STATIC_BASE_IMAGE_arm := gcr.io/distroless/static@sha256:31b88f1a22bd3676d8d2fad1022e06ce5ee1a66de896fd2cc141746f2681ae2f -STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static@sha256:2937a574d0b8257cfbb98b47ef46e3c3330b1dbe18f0ad0ccd826569f46ed57b -DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base@sha256:8267a5d9fa15a538227a8850e81cf6c548a78de73458e99a67e8799bbffb1ba0 -DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base@sha256:f19b05270bbd5c38e12c5610f23c1dfe4441858d959102a83074cf17ec074b50 -DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base@sha256:5275b5b17f9dff2f3f20fa51b80d259477726d8584494cbe51fdda07b5c4072b -DYNAMIC_BASE_IMAGE_arm := gcr.io/distroless/base@sha256:4cb05eb0f96b30360d4a0e602dc51ec7847463727ee1a66e03629ea60e11eca4 -DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base@sha256:653822f53b4b7e3caa2fa5b9a77fa1bd599655515c4325982a141c6ffac234fa +STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static@sha256:bc535c40cfde8f8f1601f6cc9b51d3387db0722a7c4756896c68e3de4f074966 +STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static@sha256:56a360f359814800d5d4f1df868ed15b2142dbfa7b2565a712f35bafebe438a6 +STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static@sha256:bd52a07bf886ed94d0af56c1f728044c59c78d128eac0fb8d464c90a57256d81 +STATIC_BASE_IMAGE_arm := gcr.io/distroless/static@sha256:2368c04cb307fd5244b92de95bd2bde6a7eb0eb4b9a0428cb276beeae127f118 +STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static@sha256:17ebcfb161267065d0fc97d7816b551cbfdc59e7aa022262a100b673a486f29e +DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base@sha256:a713d945f4a1a71828d34313456268ffc4f35db85fbbeea45dda99b5547cb0f1 +DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base@sha256:039ee280d66386a5e9b32ef7d45c6e9682d91c070e83ba898f55a83eccb34a4a +DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base@sha256:19e7679993f7652f321c3eca041a7e245dbe40a05cd1a5a46abb1ca0b856ce10 +DYNAMIC_BASE_IMAGE_arm := gcr.io/distroless/base@sha256:9d5c4c906c586b2807c9fae6af7fd8c7f0bab2f500a7fcbbff0b1933d7b72158 +DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base@sha256:e8fdbbf557d5b282023a8815bc72a3fb9bd48871c0a737d3b8c387a260249290