From 2f3c844330d4bbda63368a68b5fd5b6c4fb8baa3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 19 Jul 2024 09:14:12 -0500 Subject: [PATCH 1/4] ISO: Add docker-buildx --- .../workflows/update-iso-image-versions.yml | 19 +++++++--- .../arch/aarch64/package/Config.in | 5 ++- .../package/docker-buildx-aarch64/Config.in | 4 ++ .../docker-buildx-aarch64/docker-buildx.hash | 1 + .../docker-buildx-aarch64/docker-buildx.mk | 37 +++++++++++++++++++ .../arch/x86_64/package/Config.in | 7 ++-- .../x86_64/package/docker-buildx/Config.in | 4 ++ .../package/docker-buildx/docker-buildx.hash | 1 + .../package/docker-buildx/docker-buildx.mk | 37 +++++++++++++++++++ hack/update/get_version/get_version.go | 1 + 10 files changed, 105 insertions(+), 11 deletions(-) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index f5e42fd0aace..a03514c0ba4e 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -20,10 +20,11 @@ jobs: OLD_BUILDKIT=$(DEP=buildkit make get-dependency-version) OLD_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version) OLD_CONTAINERD=$(DEP=containerd make get-dependency-version) - OLD_CRIO=$(DEP=cri-o make get-dependency-version) OLD_CRICTL=$(DEP=crictl make get-dependency-version) + OLD_CRIO=$(DEP=cri-o make get-dependency-version) OLD_CRUN=$(DEP=crun make get-dependency-version) OLD_DOCKER=$(DEP=docker make get-dependency-version) + OLD_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version) OLD_GO=$(DEP=go make get-dependency-version) OLD_NERDCTL=$(DEP=nerdctl make get-dependency-version) OLD_NERDCTLD=$(DEP=nerdctld make get-dependency-version) @@ -37,6 +38,7 @@ jobs: # make update-crictl-version make update-crun-version make update-docker-version + make update-docker-buildx-version make update-golang-version make update-nerdctl-version make update-nerdctld-version @@ -45,10 +47,11 @@ jobs: NEW_BUILDKIT=$(DEP=buildkit make get-dependency-version) NEW_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version) NEW_CONTAINERD=$(DEP=containerd make get-dependency-version) - NEW_CRIO=$(DEP=cri-o make get-dependency-version) NEW_CRICTL=$(DEP=crictl make get-dependency-version) + NEW_CRIO=$(DEP=cri-o make get-dependency-version) NEW_CRUN=$(DEP=crun make get-dependency-version) NEW_DOCKER=$(DEP=docker make get-dependency-version) + NEW_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version) NEW_GO=$(DEP=go make get-dependency-version) NEW_NERDCTL=$(DEP=nerdctl make get-dependency-version) NEW_NERDCTLD=$(DEP=nerdctld make get-dependency-version) @@ -67,14 +70,14 @@ jobs: echo "### Update containerd from $OLD_CONTAINERD to $NEW_CONTAINERD" >> "$GITHUB_OUTPUT" echo "[Release notes](https://github.com/containerd/containerd/releases)" >> "$GITHUB_OUTPUT" fi - if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then - echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT" - echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT" - fi if [ "$OLD_CRICTL" != "$NEW_CRICTL" ]; then echo "### Update crictl from $OLD_CRICTL to $NEW_CRICTL" >> "$GITHUB_OUTPUT" echo "[Release notes](https://github.com/kubernetes-sigs/cri-tools/releases)" >> "$GITHUB_OUTPUT" fi + if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then + echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT" + echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT" + fi if [ "$OLD_CRUN" != "$NEW_CRUN" ]; then echo "### Update crun from $OLD_CRUN to $NEW_CRUN" >> "$GITHUB_OUTPUT" echo "[Release notes](https://github.com/containers/crun/releases)" >> "$GITHUB_OUTPUT" @@ -83,6 +86,10 @@ jobs: echo "### Update Docker from $OLD_DOCKER to $NEW_DOCKER" >> "$GITHUB_OUTPUT" echo "[Release notes](https://github.com/moby/moby/releases)" >> "$GITHUB_OUTPUT" fi + if [ "$OLD_DOCKER_BUILDX" != "$NEW_DOCKER_BUILDX" ]; then + echo "### Update buildx from $OLD_DOCKER_BUILDX to $NEW_DOCKER_BUILDX" >> "$GITHUB_OUTPUT" + echo "[Release notes](https://github.com/docker/buildx/releases)" >> "$GITHUB_OUTPUT" + fi if [ "$OLD_GO" != "$NEW_GO" ]; then echo "### Update Go from $OLD_GO to $NEW_GO" >> "$GITHUB_OUTPUT" fi diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 7706f08f5859..c3b8d524801d 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -1,9 +1,10 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-buildx-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in new file mode 100644 index 000000000000..cd460bba1fe1 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_DOCKER_BUILDX_AARCH64 + bool "docker-buildx" + default y + depends on BR2_aarch64 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash new file mode 100644 index 000000000000..ade73055ec2a --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash @@ -0,0 +1 @@ +sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa v0.16.1.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk new file mode 100644 index 000000000000..34466fefe580 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# docker-buildx +# +################################################################################ + +DOCKER_BUILDX_AARCH64_VERSION = v0.16.1 +DOCKER_BUILDX_AARCH64_COMMIT = 34c195271a3f6dc64814db71438dc50dd41d7e3e +DOCKER_BUILDX_AARCH64_SITE = https://github.com/docker/buildx/archive +DOCKER_BUILDX_AARCH64_SOURCE = $(DOCKER_BUILDX_AARCH64_VERSION).tar.gz +DOCKER_BUILDX_AARCH64_GOPATH = $(@D)/_output +DOCKER_BUILDX_AARCH64_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + GO111MODULE=off \ + GOPATH="$(DOCKER_BUILDX_AARCH64_GOPATH)" \ + GOBIN="$(DOCKER_BUILDX_AARCH64_GOPATH)/bin" \ + PATH=$(DOCKER_BUILDX_AARCH64_GOPATH)/bin:$(BR_PATH) \ + GOARCH=arm64 + +DOCKER_BUILDX_AARCH64_COMPILE_SRC = $(DOCKER_BUILDX_AARCH64_GOPATH)/src/github.com/docker/buildx + +define DOCKER_BUILDX_AARCH64_CONFIGURE_CMDS + mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins +endef + +define DOCKER_BUILDX_AARCH64_BUILD_CMDS + PWD=$(DOCKER_BUILDX_AARCH64_COMPILE_SRC) $(DOCKER_BUILDX_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(DOCKER_BUILDX_AARCH64_VERSION) REVISION=$(DOCKER_BUILDX_AARCH64_COMMIT) -C $(@D) build +endef + +define DOCKER_BUILDX_AARCH64_INSTALL_TARGET_CMDS + $(INSTALL) -Dm755 \ + $(@D)/bin/build/docker-buildx \ + $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index dc9734ed4a86..f1a936b24060 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,11 +1,12 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-buildx/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-mount-service/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in new file mode 100644 index 000000000000..fe34adf1f482 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_DOCKER_BUILDX + bool "docker-buildx" + default y + depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash new file mode 100644 index 000000000000..ade73055ec2a --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash @@ -0,0 +1 @@ +sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa v0.16.1.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk new file mode 100644 index 000000000000..34a21b504137 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# docker-buildx +# +################################################################################ + +DOCKER_BUILDX_VERSION = v0.16.1 +DOCKER_BUILDX_COMMIT = 34c195271a3f6dc64814db71438dc50dd41d7e3e +DOCKER_BUILDX_SITE = https://github.com/docker/buildx/archive +DOCKER_BUILDX_SOURCE = $(DOCKER_BUILDX_VERSION).tar.gz +DOCKER_BUILDX_GOPATH = $(@D)/_output +DOCKER_BUILDX_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + GO111MODULE=off \ + GOPATH="$(DOCKER_BUILDX_GOPATH)" \ + GOBIN="$(DOCKER_BUILDX_GOPATH)/bin" \ + PATH=$(DOCKER_BUILDX_GOPATH)/bin:$(BR_PATH) \ + GOARCH=amd64 + +DOCKER_BUILDX_COMPILE_SRC = $(DOCKER_BUILDX_GOPATH)/src/github.com/docker/buildx + +define DOCKER_BUILDX_CONFIGURE_CMDS + mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins +endef + +define DOCKER_BUILDX_BUILD_CMDS + PWD=$(DOCKER_BUILDX_COMPILE_SRC) $(DOCKER_BUILDX_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(DOCKER_BUILDX_VERSION) REVISION=$(DOCKER_BUILDX_COMMIT) -C $(@D) build +endef + +define DOCKER_BUILDX_INSTALL_TARGET_CMDS + $(INSTALL) -Dm755 \ + $(@D)/bin/build/docker-buildx \ + $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx +endef + +$(eval $(generic-package)) diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index e7919f79b9e4..c09783161965 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -44,6 +44,7 @@ var dependencies = map[string]dependency{ "crictl": {"deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk", `CRICTL_BIN_VERSION = (.*)`}, "crun": {"deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk", `CRUN_LATEST_VERSION = (.*)`}, "docker": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk", `DOCKER_BIN_VERSION = (.*)`}, + "docker-buildx": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk", `DOCKER_BUILDX_VERSION = (.*)`}, "flannel": {"pkg/minikube/cni/flannel.yaml", `flannel:(.*)`}, "gcp-auth": {addonsFile, `k8s-minikube/gcp-auth-webhook:(.*)@`}, "gh": {"hack/jenkins/installers/check_install_gh.sh", `GH_VERSION="(.*)"`}, From 7b0a16594bf88ef8e9c93fc7f484bd469aad7066 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 19 Jul 2024 12:46:47 -0500 Subject: [PATCH 2/4] turn go modules on --- .../arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk | 2 +- .../arch/x86_64/package/docker-buildx/docker-buildx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk index 34466fefe580..f1acda8fe715 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk @@ -12,7 +12,7 @@ DOCKER_BUILDX_AARCH64_GOPATH = $(@D)/_output DOCKER_BUILDX_AARCH64_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ - GO111MODULE=off \ + GO111MODULE=on \ GOPATH="$(DOCKER_BUILDX_AARCH64_GOPATH)" \ GOBIN="$(DOCKER_BUILDX_AARCH64_GOPATH)/bin" \ PATH=$(DOCKER_BUILDX_AARCH64_GOPATH)/bin:$(BR_PATH) \ diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk index 34a21b504137..e7f4f82b0da6 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk @@ -12,7 +12,7 @@ DOCKER_BUILDX_GOPATH = $(@D)/_output DOCKER_BUILDX_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ - GO111MODULE=off \ + GO111MODULE=on \ GOPATH="$(DOCKER_BUILDX_GOPATH)" \ GOBIN="$(DOCKER_BUILDX_GOPATH)/bin" \ PATH=$(DOCKER_BUILDX_GOPATH)/bin:$(BR_PATH) \ From 88700932aef3673bee76725bdfefadfca71500bc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 19 Jul 2024 14:30:02 -0500 Subject: [PATCH 3/4] disable VCS stamping --- .../aarch64/package/docker-buildx-aarch64/docker-buildx.mk | 7 +++++++ .../arch/x86_64/package/docker-buildx/docker-buildx.mk | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk index f1acda8fe715..0c72d4173048 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk @@ -20,6 +20,13 @@ DOCKER_BUILDX_AARCH64_ENV = \ DOCKER_BUILDX_AARCH64_COMPILE_SRC = $(DOCKER_BUILDX_AARCH64_GOPATH)/src/github.com/docker/buildx +define DOCKER_BUILDX_AARCH64_POST_EXTRACT_WORKAROUNDS + # Set -buildvcs=false to disable VCS stamping (fails in buildroot) + sed -i 's|go build |go build -buildvcs=false |' -i $(@D)/hack/build +endef + +DOCKER_BUILDX_AARCH64_POST_EXTRACT_HOOKS += DOCKER_BUILDX_AARCH64_POST_EXTRACT_WORKAROUNDS + define DOCKER_BUILDX_AARCH64_CONFIGURE_CMDS mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins endef diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk index e7f4f82b0da6..66e8146df4cc 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk @@ -20,6 +20,13 @@ DOCKER_BUILDX_ENV = \ DOCKER_BUILDX_COMPILE_SRC = $(DOCKER_BUILDX_GOPATH)/src/github.com/docker/buildx +define DOCKER_BUILDX_POST_EXTRACT_WORKAROUNDS + # Set -buildvcs=false to disable VCS stamping (fails in buildroot) + sed -i 's|go build |go build -buildvcs=false |' -i $(@D)/hack/build +endef + +DOCKER_BUILDX_POST_EXTRACT_HOOKS += DOCKER_BUILDX_POST_EXTRACT_WORKAROUNDS + define DOCKER_BUILDX_CONFIGURE_CMDS mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins endef From e79d8f18cc345a7ce507e89c32718459989bca77 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 19 Jul 2024 23:44:14 +0000 Subject: [PATCH 4/4] Updating ISO to v1.33.1-1721417592-18487 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 126720450984..4dbc0e5e9ab5 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1721324531-19298 +ISO_VERSION ?= v1.33.1-1721417592-18487 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index fdf6b16885a7..11201d2827dc 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19298" + isoBucket := "minikube-builds/iso/18487" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),