Kicbase/ISO: update crio to 1.32

.github/workflows/master.yml

@@ -560,7 +560,7 @@ jobs:
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service
           sudo chmod +x /usr/bin/cri-dockerd
-          CRICTL_VERSION="v1.28.0"
+          CRICTL_VERSION="v1.32.0"
           curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz
           sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
       # https://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver

.github/workflows/pr.yml

@@ -558,7 +558,7 @@ jobs:
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service
           sudo chmod +x /usr/bin/cri-dockerd
-          CRICTL_VERSION="v1.28.0"
+          CRICTL_VERSION="v1.32.0"
           curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz
           sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
       # https://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver

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.35.0
+ISO_VERSION ?= v1.35.0-1745968531-20630
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -47,9 +47,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.11.2
 # 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.4 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
 
@@ -1108,7 +1108,7 @@ update-buildkit-version:
 .PHONY: update-cri-o-version
 update-cri-o-version:
 	(cd hack/update/cri-o_version && \
-	 go run update_cri-o_version.go)
+	 go run .)
 
 .PHONY: update-crun-version
 update-crun-version:
@@ -1190,11 +1190,6 @@ update-nerdctl-version:
 	(cd hack/update/nerdctl_version && \
 	 go run update_nerdctl_version.go)
 
-.PHONY: update-crictl-version
-update-crictl-version:
-	(cd hack/update/crictl_version && \
-	 go run update_crictl_version.go)
-
 .PHONY: update-kindnetd-version
 update-kindnetd-version:
 	(cd hack/update/kindnetd_version && \

deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk

@@ -18,7 +18,11 @@ CRI_DOCKERD_AARCH64_ENV = \
 	GO111MODULE=on \
 	GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \
 	PATH=$(CRI_DOCKERD_AARCH64_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=arm64
+	GOARCH=arm64 \
+	GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
+
 
 CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'"

deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash

@@ -1,2 +1,3 @@
 sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz
 sha256 06e9224e42bc5e23085751e93cccdac89f7930ba6f7a45b8f8fc70ef663c37c4  crictl-v1.28.0-linux-arm64.tar.gz
+sha256 f2f4e20658b72d00897f41e4b57093c8080e2d800ee894a5f4351f31d1833e30  crictl-v1.32.0-linux-arm64.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRICTL_BIN_AARCH64_VERSION = v1.28.0
+CRICTL_BIN_AARCH64_VERSION = v1.32.0
 CRICTL_BIN_AARCH64_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_AARCH64_VERSION)
 CRICTL_BIN_AARCH64_SOURCE = crictl-$(CRICTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
 CRICTL_BIN_AARCH64_STRIP_COMPONENTS = 0

deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk

@@ -16,7 +16,11 @@ DOCKER_BUILDX_AARCH64_ENV = \
         GOPATH="$(DOCKER_BUILDX_AARCH64_GOPATH)" \
         GOBIN="$(DOCKER_BUILDX_AARCH64_GOPATH)/bin" \
         PATH=$(DOCKER_BUILDX_AARCH64_GOPATH)/bin:$(BR_PATH) \
-        GOARCH=arm64
+        GOARCH=arm64 \
+	GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
+
 
 DOCKER_BUILDX_AARCH64_COMPILE_SRC = $(DOCKER_BUILDX_AARCH64_GOPATH)/src/github.com/docker/buildx
 

deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk

@@ -18,6 +18,7 @@ CONTAINERD_BIN_ENV = \
 	PATH=$(CONTAINERD_BIN_GOPATH)/bin:$(BR_PATH) \
 	GOARCH=amd64
 
+
 CONTAINERD_BIN_COMPILE_SRC = $(CONTAINERD_BIN_GOPATH)/src/github.com/containerd/containerd
 
 define CONTAINERD_BIN_USERS

deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk

@@ -15,10 +15,12 @@ CRI_DOCKERD_GOPATH = $(@D)/_output
 CRI_DOCKERD_ENV = \
 	$(GO_TARGET_ENV) \
 	CGO_ENABLED=0 \
-	GO111MODULE=on \
 	GOPATH="$(CRI_DOCKERD_GOPATH)" \
 	PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=amd64
+	GOARCH=amd64 \
+	GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
 
 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"

deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.hash

@@ -8,3 +8,4 @@ sha256 87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae  crictl-
 sha256 44d5f550ef3f41f9b53155906e0229ffdbee4b19452b4df540265e29572b899c  crictl-v1.20.0-linux-amd64.tar.gz
 sha256 85c78a35584971625bf1c3bcd46e5404a90396f979d7586f18b11119cb623e24  crictl-v1.21.0-linux-amd64.tar.gz
 sha256 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508  crictl-v1.28.0-linux-amd64.tar.gz
+sha256 f050b71d3a73a91a4e0990b90143ed04dcd100cc66f953736fcb6a2730e283c4  crictl-v1.32.0-linux-amd64.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRICTL_BIN_VERSION = v1.28.0
+CRICTL_BIN_VERSION = v1.32.0
 CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION)
 CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-amd64.tar.gz
 CRICTL_BIN_STRIP_COMPONENTS = 0

deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk

@@ -16,7 +16,10 @@ DOCKER_BUILDX_ENV = \
         GOPATH="$(DOCKER_BUILDX_GOPATH)" \
         GOBIN="$(DOCKER_BUILDX_GOPATH)/bin" \
         PATH=$(DOCKER_BUILDX_GOPATH)/bin:$(BR_PATH) \
-        GOARCH=amd64
+        GOARCH=amd64 \
+        GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
 
 DOCKER_BUILDX_COMPILE_SRC = $(DOCKER_BUILDX_GOPATH)/src/github.com/docker/buildx
 

deploy/iso/minikube-iso/go.hash

@@ -35,3 +35,4 @@ sha256  36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f  go1.23
 sha256  8d6a77332487557c6afa2421131b50f83db4ae3c579c3bc72e670ee1f6968599  go1.23.3.src.tar.gz
 sha256  ad345ac421e90814293a9699cca19dd5238251c3f687980bbcae28495b263531  go1.23.4.src.tar.gz
 sha256  d14120614acb29d12bcab72bd689f257eb4be9e0b6f88a8fb7e41ac65f8556e5  go1.24.0.src.tar.gz
+sha256  6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971  go1.23.4.linux-amd64.tar.gz

deploy/iso/minikube-iso/package/Config.in

@@ -1,12 +1,10 @@
 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"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

@@ -29,3 +29,5 @@ sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.
 sha256 5543b96b668e964a24d5fc4af9a0e51e4c571c4c4bec5f0cf2cfd5df76debd7f v1.24.1.tar.gz
 sha256 525ea1048b303e0022d91dc7465907a9e6baf576df1c004d9422d16e3130006a v1.28.3.tar.gz
 sha256 d4f9d5a35e7e6a9838bbc052f66561d453c710d94fc47207a9e528232b878505 v1.29.1.tar.gz
+sha256 20ea08912c048c3a411e0db9f3d265dcb3db005b3ad3c353c1e4aa65a5fffc2d v1.31.5.tar.gz
+sha256 982b9f3fd1ff92c2d3f35651c1c2cd30f46b267a61629093c58b0bad56451ba2 v1.32.3.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.29.1
-CRIO_BIN_COMMIT = 78e179ba8dd3ce462382a17049e8d1f770246af1
+CRIO_BIN_VERSION = v1.32.3
+CRIO_BIN_COMMIT = 823120c1035558215a91d8e6b9076da57568eda5
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme
@@ -17,10 +17,13 @@ endif
 CRIO_BIN_ENV = \
 	$(GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
-	GO111MODULE=off \
+	GO111MODULE=on \
 	GOPATH="$(CRIO_BIN_GOPATH)" \
 	PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=$(CRIO_BIN_GOARCH)
+	GOARCH=$(CRIO_BIN_GOARCH) \
+	GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
 
 define CRIO_BIN_USERS
 	- -1 crio-admin -1 - - - - -
@@ -36,7 +39,7 @@ endef
 
 define CRIO_BIN_BUILD_CMDS
 	mkdir -p $(@D)/bin
-	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) COMMIT_NO=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) COMMIT_NO=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries TRIMPATH="-trimpath -buildvcs=false"
 endef
 
 define CRIO_BIN_INSTALL_TARGET_CMDS

deploy/iso/minikube-iso/package/crio-bin/crio.conf

@@ -102,7 +102,7 @@ decryption_keys_path = "/etc/crio/keys/"
 
 # Path to the conmon binary, used for monitoring the OCI runtime.
 # Will be searched for using $PATH if empty.
-conmon = "/usr/libexec/crio/conmon"
+conmon = "/usr/bin/conmon"
 
 # Cgroup setting for conmon
 conmon_cgroup = "system.slice"

deploy/iso/minikube-iso/package/crio-bin/crio.service

@@ -2,6 +2,7 @@
 Description=Container Runtime Interface for OCI (CRI-O)
 Documentation=https://github.com/cri-o/cri-o
 Wants=network-online.target
+Before=kubelet.service
 After=network-online.target minikube-automount.service
 Requires=minikube-automount.service
 
@@ -22,6 +23,10 @@ LimitCORE=infinity
 OOMScoreAdjust=-999
 TimeoutStartSec=0
 Restart=on-abnormal
+RestartSec=10
+WatchdogSec=60s
+
 
 [Install]
 WantedBy=multi-user.target
+Alias=cri-o.service

deploy/iso/minikube-iso/package/podman/podman.mk

@@ -25,7 +25,10 @@ PODMAN_BIN_ENV = \
 	CGO_ENABLED=1 \
 	GOPATH="$(PODMAN_GOPATH)" \
 	PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=$(PODMAN_GOARCH)
+	GOARCH=$(PODMAN_GOARCH) \
+	GOPROXY="https://proxy.golang.org,direct" \
+	GOSUMDB='sum.golang.org'\
+	GOOS=linux
 
 define PODMAN_USERS
 	- -1 podman -1 - - - - -