From b34f876320b5a95e2f86e3b9f73de251862e60f3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 1 Nov 2024 16:24:14 -0700 Subject: [PATCH 1/2] ISO: Update Buildroot from 2023.02.9 to 2024.02.7 --- Makefile | 4 +-- deploy/iso/minikube-iso/package/Config.in | 1 - .../iso/minikube-iso/package/conmon/Config.in | 7 ------ .../minikube-iso/package/conmon/conmon.hash | 12 --------- .../iso/minikube-iso/package/conmon/conmon.mk | 25 ------------------- .../package/falco-module/falco-module.mk | 12 +++++---- .../iso/minikube-iso/package/sysdig/sysdig.mk | 2 +- 7 files changed, 10 insertions(+), 53 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/conmon/Config.in delete mode 100644 deploy/iso/minikube-iso/package/conmon/conmon.hash delete mode 100644 deploy/iso/minikube-iso/package/conmon/conmon.mk diff --git a/Makefile b/Makefile index f5874190e463..6e43a2f7a839 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,9 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2023.02.9 +BUILDROOT_BRANCH ?= 2024.02.7 # the go version on the line below is for the ISO -GOLANG_OPTIONS = GO_VERSION=1.21.6 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash +GOLANG_OPTIONS = GO_VERSION=1.23.2 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS) REGISTRY ?= gcr.io/k8s-minikube diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index a7513f186bd8..719014347ba4 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,5 +1,4 @@ menu "System tools" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun-latest/Config.in" diff --git a/deploy/iso/minikube-iso/package/conmon/Config.in b/deploy/iso/minikube-iso/package/conmon/Config.in deleted file mode 100644 index 6d4df09cf9ca..000000000000 --- a/deploy/iso/minikube-iso/package/conmon/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_CONMON - bool "conmon" - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_SYSTEMD diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.hash b/deploy/iso/minikube-iso/package/conmon/conmon.hash deleted file mode 100644 index ae93257e04fc..000000000000 --- a/deploy/iso/minikube-iso/package/conmon/conmon.hash +++ /dev/null @@ -1,12 +0,0 @@ -# Locally computed -sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz -sha256 75fad6e66b43c5039719edbd82ba072723aea6a9d4d8be4e7ac1c245a291ab1b 8455ce1ef385120deb827d0f0588c04357bad4c4.tar.gz -sha256 32db4ea508a9ff0266b8695ae32604869994371a5a09436438c366a09ddcc1df v0.3.0.tar.gz -sha256 6c9bf278ae6e125a39f1ae419e5bd314162a743f6587d70b1b6be095ac32b9af eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6.tar.gz -sha256 50cc36636c32a343f4c9f5ab6b9f7f5edd5d6ef7c9c403793f799f6605597718 v2.0.3.tar.gz -sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c336700f2999acf9db07662b4a61355076e64a.tar.gz -sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.tar.gz -sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz -sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz -sha256 e00bc44a8bd783fd417a5c90d3b8c15035ddc69b18350a31258e7f79aec8c697 v2.0.24.tar.gz -sha256 8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e v2.1.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.mk b/deploy/iso/minikube-iso/package/conmon/conmon.mk deleted file mode 100644 index 0d567aaf24cf..000000000000 --- a/deploy/iso/minikube-iso/package/conmon/conmon.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# conmon -# -################################################################################ - -CONMON_VERSION = v2.1.2 -CONMON_COMMIT = 2bc95ee697e87d5f7b77063cf83fc32739addafe -CONMON_SITE = https://github.com/containers/conmon/archive -CONMON_SOURCE = $(CONMON_VERSION).tar.gz -CONMON_LICENSE = Apache-2.0 -CONMON_LICENSE_FILES = LICENSE - -CONMON_DEPENDENCIES = host-pkgconf - -define CONMON_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CONMON_COMMIT) PREFIX=/usr -endef - -define CONMON_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/crio/conmon - $(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/podman/conmon -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk index 6328d2d0605d..519f1ede339c 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk @@ -24,11 +24,13 @@ FALCO_MODULE_POST_EXTRACT_HOOKS += FALCO_MODULE_FALCOSECURITY_LIBS_SRC FALCO_MODULE_CONF_OPTS = -DFALCO_VERSION=$(FALCO_MODULE_VERSION) FALCO_MODULE_CONF_OPTS += -DUSE_BUNDLED_DEPS=ON -FALCO_MODULE_MAKE_ENV = $(LINUX_MAKE_ENV) -FALCO_MODULE_MAKE_OPTS = $(LINUX_MAKE_FLAGS) driver KERNELDIR=$(LINUX_DIR) -FALCO_MODULE_INSTALL_OPTS = install_driver -FALCO_MODULE_INSTALL_STAGING_OPTS = INSTALL_MOD_PATH=$(STAGING_DIR) install_driver -FALCO_MODULE_INSTALL_TARGET_OPTS = INSTALL_MOD_PATH=$(TARGET_DIR) install_driver +define FALCO_MODULE_BUILD_CMDS + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) driver KERNELDIR=$(LINUX_DIR) -C $(@D) +endef + +define FALCO_MODULE_INSTALL_TARGET_CMDS + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) driver KERNELDIR=$(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install_driver -C $(@D) +endef $(eval $(kernel-module)) $(eval $(cmake-package)) diff --git a/deploy/iso/minikube-iso/package/sysdig/sysdig.mk b/deploy/iso/minikube-iso/package/sysdig/sysdig.mk index d497c7c381f1..74e93e8f204f 100644 --- a/deploy/iso/minikube-iso/package/sysdig/sysdig.mk +++ b/deploy/iso/minikube-iso/package/sysdig/sysdig.mk @@ -46,7 +46,7 @@ SYSDIG_POST_PATCH_HOOKS += SYSDIG_MODULE_GEN_MAKEFILE SYSDIG_CONF_OPTS += -DBUILD_DRIVER=OFF SYSDIG_MODULE_SUBDIRS = driver -SYSDIG_MODULE_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) +SYSDIG_MODULE_BUILD_OPTS = KERNELDIR=$(LINUX_DIR) $(eval $(kernel-module)) $(eval $(cmake-package)) From 933d7890a85f0bd342fbfb9bccc4d24e4b1465a0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 2 Nov 2024 13:43:57 +0000 Subject: [PATCH 2/2] Updating ISO to v1.34.0-1730528132-18433 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e43a2f7a839..e1c1d95500ad 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.34.0-1730282777-19883 +ISO_VERSION ?= v1.34.0-1730528132-18433 # 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 22d269b13114..95a0f187c32c 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/19883" + isoBucket := "minikube-builds/iso/18433" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),