kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Kicbase/ISO: Update cri-dockerd from v0.3.15 to v0.4.0 (#20747) 

* Kicbase/ISO: Update cri-dockerd from v0.3.15 to v0.4.0

* Updating kicbase image to v0.0.46-1747166185-20747

* Updating ISO to v1.35.0-1747160120-20747
pull/20761/head
minikube-bot 2025-05-14 14:49:05 -07:00 committed by GitHub
parent f8bfff025c
commit a141f42521
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/master.yml vendored
View File

@ -553,8 +553,8 @@ jobs:
- name: Install cri_dockerd & crictl - name: Install cri_dockerd & crictl
shell: bash shell: bash
run: | run: |
CRI_DOCKERD_VERSION="v0.3.15" CRI_DOCKERD_VERSION="v0.4.0"
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb"
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
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.socket" -o /usr/lib/systemd/system/cri-docker.socket

4
.github/workflows/pr.yml vendored
View File

@ -551,8 +551,8 @@ jobs:
- name: Install cri_dockerd & crictl - name: Install cri_dockerd & crictl
shell: bash shell: bash
run: | run: |
CRI_DOCKERD_VERSION="v0.3.15" CRI_DOCKERD_VERSION="v0.4.0"
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb"
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
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.socket" -o /usr/lib/systemd/system/cri-docker.socket

2
Makefile
View File

@ -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) 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 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.35.0-1746739450-20720 ISO_VERSION ?= v1.35.0-1747160120-20747
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

1
deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
View File

@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
sha256 2311f48aa6cada72dfcbea452472d18f09c6b64d48cd074f1ba6675658a9cd7c b9b889355f3002c01db294427964e454dfbc3feb.tar.gz

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

@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
CRI_DOCKERD_AARCH64_VER = 0.3.15 CRI_DOCKERD_AARCH64_VER = 0.4.0
CRI_DOCKERD_AARCH64_REV = c1c566e CRI_DOCKERD_AARCH64_REV = b9b8893
CRI_DOCKERD_AARCH64_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9 CRI_DOCKERD_AARCH64_VERSION = b9b889355f3002c01db294427964e454dfbc3feb
CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz

1
deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
View File

@ -9,3 +9,4 @@ sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz sha256 4a56bba890eb6591a2ff2d28f93f3b4eb606b371b91ff0c8b5be3f9bb92b5c45 683f70f69901e66d49dfac802841ff843171f131.tar.gz
sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz sha256 7951c46c206026f0b4c9e2b88d7f9fb67927abcfde37a1f4be5d16c83dc7a30b c1c566e0cc84abe6972f0bf857ecd8fe306258d9.tar.gz
sha256 2311f48aa6cada72dfcbea452472d18f09c6b64d48cd074f1ba6675658a9cd7c b9b889355f3002c01db294427964e454dfbc3feb.tar.gz

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

@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
CRI_DOCKERD_VER = 0.3.15 CRI_DOCKERD_VER = 0.4.0
CRI_DOCKERD_REV = c1c566e CRI_DOCKERD_REV = b9b8893
CRI_DOCKERD_VERSION = c1c566e0cc84abe6972f0bf857ecd8fe306258d9 CRI_DOCKERD_VERSION = b9b889355f3002c01db294427964e454dfbc3feb
CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz

4
deploy/kicbase/Dockerfile
View File

@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase
ARG BUILDKIT_VERSION="v0.18.1" ARG BUILDKIT_VERSION="v0.18.1"
ARG CRIO_VERSION="1.24" ARG CRIO_VERSION="1.24"
ARG CRI_DOCKERD_VERSION="v0.3.15" ARG CRI_DOCKERD_VERSION="v0.4.0"
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" ARG CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb"
ARG CNI_PLUGINS_VERSION="v1.4.0" ARG CNI_PLUGINS_VERSION="v1.4.0"
ARG TARGETARCH ARG TARGETARCH
ARG NERDCTL_VERSION="1.7.7" ARG NERDCTL_VERSION="1.7.7"

4
hack/jenkins/linux_integration_tests_none.sh
View File

@ -70,12 +70,12 @@ if ! which socat &>/dev/null; then
fi fi
# cri-dockerd is required for Kubernetes v1.24+ with none driver # cri-dockerd is required for Kubernetes v1.24+ with none driver
CRI_DOCKERD_VERSION="0.3.15" CRI_DOCKERD_VERSION="0.4.0"
if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then
echo "WARNING: expected version of cri-dockerd is not installed. will try to install." echo "WARNING: expected version of cri-dockerd is not installed. will try to install."
sudo systemctl stop cri-docker.socket || true sudo systemctl stop cri-docker.socket || true
sudo systemctl stop cri-docker.service || true sudo systemctl stop cri-docker.service || true
CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb"
CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_COMMIT}"
sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd
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.socket" -o /usr/lib/systemd/system/cri-docker.socket

4
pkg/drivers/kic/types.go
View File

@ -24,10 +24,10 @@ import (
const ( const (
// Version is the current version of kic // Version is the current version of kic
Version = "v0.0.46-1746731792-20718" Version = "v0.0.46-1747166185-20747"
// SHA of the kic base image // SHA of the kic base image
baseImageSHA = "074d9afa1e8827ea0e101248fc55098d304814b5d8bf485882a81afc90084155" baseImageSHA = "31ff2b89dcf211d24c0a27b61b1d16410e657f88795a93cf7da2073a8028b290"
// The name of the GCR kicbase repository // The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository // The name of the Dockerhub kicbase repository

2
pkg/minikube/download/iso.go
View File

@ -41,7 +41,7 @@ const fileScheme = "file"
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
func DefaultISOURLs() []string { func DefaultISOURLs() []string {
v := version.GetISOVersion() v := version.GetISOVersion()
isoBucket := "minikube-builds/iso/20720" isoBucket := "minikube-builds/iso/20747"
return []string{ return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

2
site/content/en/docs/commands/start.md
View File

@ -27,7 +27,7 @@ minikube start [flags]
--apiserver-port int The apiserver listening port (default 8443) --apiserver-port int The apiserver listening port (default 8443)
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.46-1746731792-20718@sha256:074d9afa1e8827ea0e101248fc55098d304814b5d8bf485882a81afc90084155") --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.46-1747166185-20747@sha256:31ff2b89dcf211d24c0a27b61b1d16410e657f88795a93cf7da2073a8028b290")
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)