Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/functional_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ jobs:
shell: bash
if: matrix.driver == 'none'
run: |
CRICTL_VERSION="v1.28.0"
CRICTL_VERSION="v1.34.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
# conntrack is required for kubernetes 1.18 and higher
Expand Down
2 changes: 1 addition & 1 deletion Makefile
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.37.0-1763408543-21899
ISO_VERSION ?= v1.37.0-1763503576-21924

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
Original file line number Diff line number Diff line change
@@ -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 c31d252e203df5f4cf37f314bd3092eb79087e791631c1e607087c74b6d0423f crictl-v1.34.0-linux-arm64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

CRICTL_BIN_AARCH64_VERSION = v1.28.0
CRICTL_BIN_AARCH64_VERSION = v1.34.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 a8ff2a3edb37a98daf3aba7c3b284fe0aa5bff24166d896ab9ef64c8913c9f51 crictl-v1.34.0-linux-amd64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

CRICTL_BIN_VERSION = v1.28.0
CRICTL_BIN_VERSION = v1.34.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
Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/linux_integration_tests_none.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then
fi

# crictl is required for Kubernetes v1.24+ with none driver
CRICTL_VERSION="v1.28.0"
CRICTL_VERSION="v1.34.0"
if [[ $(crictl --version) != *"$CRICTL_VERSION"* ]]; then
echo "WARNING: expected version of crictl is not installed. will try to install."
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
Expand Down
13 changes: 8 additions & 5 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ ii ca-certificates 20230311+deb12u1 all
ii catatonit 0.1.7-1+b2 amd64 init process for containers
ii conmon 2.1.6+ds1-1 amd64 OCI container runtime monitor
ii conntrack 1:1.4.7-1+b2 amd64 Program to modify the conntrack tables
ii containerd.io 1.7.28-1~debian.12~bookworm amd64 An open and reliable container runtime
ii containerd.io 2.1.5-1~debian.12~bookworm amd64 An open and reliable container runtime
ii containernetworking-plugins 1.1.1+ds1-3+b5 amd64 standard networking plugins - binaries
ii coreutils 9.1-1 amd64 GNU core utilities
ii cri-o 1.34.1-1.2 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
ii cri-o 1.34.2-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
ii crun 1.8.1-1+deb12u1 amd64 lightweight OCI runtime for running containers
ii curl 7.88.1-10+deb12u14 amd64 command line tool for transferring data with URL syntax
ii dash 0.5.12-2 amd64 POSIX-compliant shell
Expand All @@ -35,9 +35,9 @@ ii diffutils 1:3.8-4 amd64
ii dirmngr 2.2.40-1.1+deb12u1 amd64 GNU privacy guard - network certificate management service
ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library
ii dnsutils 1:9.18.41-1~deb12u1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.29.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
ii docker-ce 5:28.5.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:28.5.1-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
ii docker-buildx-plugin 0.30.0-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
ii docker-ce 5:29.0.2-1~debian.12~bookworm amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:29.0.2-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.22 amd64 Debian package management system
ii e2fsprogs 1.47.0-2+b2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-5 amd64 Ethernet bridge frame table administration
Expand Down Expand Up @@ -114,6 +114,7 @@ ii libicu72:amd64 72.1-3+deb12u1 amd64
ii libidn2-0:amd64 2.3.3-1+b1 amd64 Internationalized domain names (IDNA2008/TR46) library
ii libip4tc2:amd64 1.8.9-2 amd64 netfilter libip4tc library
ii libip6tc2:amd64 1.8.9-2 amd64 netfilter libip6tc library
ii libjansson4:amd64 2.14-2 amd64 C library for encoding, decoding and manipulating JSON data
ii libjemalloc2:amd64 5.3.0-1 amd64 general-purpose scalable concurrent malloc(3) implementation
ii libjson-c5:amd64 0.16-2 amd64 JSON manipulation library - shared library
ii libk5crypto3:amd64 1.20.1-2+deb12u4 amd64 MIT Kerberos runtime libraries - Crypto Library
Expand All @@ -135,6 +136,7 @@ ii libnetfilter-conntrack3:amd64 1.0.9-3 amd64
ii libnettle8:amd64 3.8.1-2 amd64 low level cryptographic library (symmetric and one-way cryptos)
ii libnfnetlink0:amd64 1.0.2-2 amd64 Netfilter netlink library
ii libnfsidmap1:amd64 1:2.6.2-4+deb12u1 amd64 NFS idmapping library
ii libnftables1:amd64 1.0.6-2+deb12u2 amd64 Netfilter nftables high level userspace API library
ii libnftnl11:amd64 1.2.4-2 amd64 Netfilter nftables userspace API library
ii libnghttp2-14:amd64 1.52.0-1+deb12u2 amd64 library implementing HTTP/2 protocol (shared library)
ii libnpth0:amd64 1.6-3 amd64 replacement for GNU Pth using system threads
Expand Down Expand Up @@ -197,6 +199,7 @@ ii ncurses-bin 6.4-4 amd64
ii netbase 6.4 all Basic TCP/IP networking system
ii netcat-openbsd 1.219-1 amd64 TCP/IP swiss army knife
ii nfs-common 1:2.6.2-4+deb12u1 amd64 NFS support files common to client and server
ii nftables 1.0.6-2+deb12u2 amd64 Program to control packet filtering rules by Netfilter project
ii nvidia-container-toolkit 1.18.0-1 amd64 NVIDIA Container toolkit
ii nvidia-container-toolkit-base 1.18.0-1 amd64 NVIDIA Container Toolkit Base
ii openssh-client 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) client, for secure access to remote machines
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.48-1761985721-21837"
Version = "v0.0.48-1763507788-21924"

// SHA of the kic base image
baseImageSHA = "a50b37e97dfdea51156e079ca6b45818a801b3d41bbe13d141f35d2e1af6c7d1"
baseImageSHA = "1e20c07242571f3eb6bbb213b88269c923b5578034662e07409047e7102bdd1a"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
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/21899"
isoBucket := "minikube-builds/iso/21924"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ minikube start [flags]
--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-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.48-1761985721-21837@sha256:a50b37e97dfdea51156e079ca6b45818a801b3d41bbe13d141f35d2e1af6c7d1")
--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.48-1763507788-21924@sha256:1e20c07242571f3eb6bbb213b88269c923b5578034662e07409047e7102bdd1a")
--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)
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
Expand Down
Loading