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.

Sign up for GitHub

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

ISO: Update Buildroot from 2023.02.9 to 2024.02.7 #18433

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ISO: Update Buildroot from 2023.02.9 to 2024.02.7 #18433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34f876
ISO: Update Buildroot from 2023.02.9 to 2024.02.7
spowelljr Nov 1, 2024
933d789
Updating ISO to v1.34.0-1730528132-18433
minikube-bot Nov 2, 2024
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion deploy/iso/minikube-iso/package/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 0 additions & 7 deletions deploy/iso/minikube-iso/package/conmon/Config.in
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/iso/minikube-iso/package/conmon/conmon.hash
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions deploy/iso/minikube-iso/package/conmon/conmon.mk
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions deploy/iso/minikube-iso/package/falco-module/falco-module.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/sysdig/sysdig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down