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
17 changes: 2 additions & 15 deletions deploy/kicbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ RUN clean-install \
gnupg \
sudo \
openssh-server \
dnsutils \
# libglib2.0-0 is required for conmon, which is required for podman
libglib2.0-0
dnsutils

# Add support for rsa1 in sshd
# modern debian-based OSs dont support rsa1 by default, so we need to enable it to support older ssh clients
Expand Down Expand Up @@ -194,7 +192,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/
&& systemctl enable buildkit.socket

# install podman
RUN clean-install podman && \
RUN clean-install podman catatonit crun && \
addgroup --system podman && \
mkdir -p /etc/systemd/system/podman.socket.d && \
printf "[Socket]\nSocketMode=0660\nSocketUser=root\nSocketGroup=podman\n" \
Expand Down Expand Up @@ -222,17 +220,6 @@ RUN export ARCH=$(dpkg --print-architecture) && \
else \
echo "Skipping crictl install for armhf: No asset available in v1.34.0"; \
fi
# install cri-o dependencies:
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/Release.key | \
gpg --dearmor --yes -o /etc/apt/keyrings/libcontainers-archive-keyring.gpg && \
sh -c "echo 'deb [signed-by=/etc/apt/keyrings/libcontainers-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
if [ "$ARCH" != "ppc64le" ]; then \
clean-install catatonit crun; \
else \
clean-install crun; \
fi
# install containernetworking-plugins
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm/') && \
curl -LO "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz" && \
Expand Down
10 changes: 1 addition & 9 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ii containerd.io 1.7.28-1~debian.12~bookworm amd64
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.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
ii criu 4.1.1-3 amd64 checkpoint and restore in userspace
ii crun 100:1.2-2 amd64 OCI runtime written in C
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
ii dbus 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (system message bus)
Expand Down Expand Up @@ -115,7 +114,6 @@ 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 @@ -133,15 +131,12 @@ ii libmd0:amd64 1.0.4-2 amd64
ii libmnl0:amd64 1.0.4-3 amd64 minimalistic Netlink communication library
ii libmount1:amd64 2.38.1-5+deb12u3 amd64 device mounting library
ii libncursesw6:amd64 6.4-4 amd64 shared libraries for terminal handling (wide character support)
ii libnet1:amd64 1.1.6+dfsg-3.2 amd64 library for the construction and handling of network packets
ii libnetfilter-conntrack3:amd64 1.0.9-3 amd64 Netfilter netlink-conntrack library
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 libnl-3-200:amd64 3.7.0-0.2+b1 amd64 library for dealing with netlink sockets
ii libnpth0:amd64 1.6-3 amd64 replacement for GNU Pth using system threads
ii libnsl2:amd64 1.3.0-2 amd64 Public client interface for NIS(YP) and NIS+
ii libnvidia-container-tools 1.17.9-1 amd64 NVIDIA container runtime library (command-line tools)
Expand All @@ -155,7 +150,6 @@ ii libpcre2-8-0:amd64 10.42-1 amd64
ii libpopt0:amd64 1.19+dfsg-1 amd64 lib for parsing cmdline parameters
ii libproc2-0:amd64 2:4.0.2-3 amd64 library for accessing process information from /proc
ii libprotobuf-c1:amd64 1.4.1-1+b1 amd64 Protocol Buffers C shared library (protobuf-c)
ii libprotobuf32:amd64 3.21.12-3 amd64 protocol buffers C++ library
ii libpsl5:amd64 0.21.2-1 amd64 Library for Public Suffix List (shared libraries)
ii libpython3-stdlib:amd64 3.11.2-1+b1 amd64 interactive high-level object-oriented language (default python3 version)
ii libpython3.11-minimal:amd64 3.11.2-6+deb12u6 amd64 Minimal subset of the Python language (version 3.11)
Expand Down Expand Up @@ -217,7 +211,6 @@ ii podman 4.3.1+ds1-8+deb12u1+b1 amd64
ii procps 2:4.0.2-3 amd64 /proc file system utilities
ii python3 3.11.2-1+b1 amd64 interactive high-level object-oriented language (default python3 version)
ii python3-minimal 3.11.2-1+b1 amd64 minimal subset of the Python language (default python3 version)
ii python3-protobuf 3.21.12-3 amd64 Python 3 bindings for protocol buffers
ii python3.11 3.11.2-6+deb12u6 amd64 Interactive high-level object-oriented language (version 3.11)
ii python3.11-minimal 3.11.2-6+deb12u6 amd64 Minimal subset of the Python language (version 3.11)
ii readline-common 8.2-1.3 all GNU readline and history libraries, common files
Expand All @@ -226,7 +219,6 @@ ii rsync 3.2.7-1+deb12u2 amd64
ii runit-helper 2.15.2 all dh-runit implementation detail
ii sed 4.9-1 amd64 GNU stream editor for filtering/transforming text
ii sensible-utils 0.0.17+nmu1 all Utilities for sensible alternative selection
ii sgml-base 1.31 all SGML infrastructure and SGML catalog file support
ii socat 1.7.4.4-2 amd64 multipurpose relay for bidirectional data transfer
ii sudo 1.9.13p3-1+deb12u2 amd64 Provide limited super user privileges to specific users
ii systemd 252.39-1~deb12u1 amd64 system and service manager
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-1760609789-21757"
Version = "v0.0.48-1760939008-21773"

// SHA of the kic base image
baseImageSHA = "9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6"
baseImageSHA = "d8d8a3f29f027433bea12764bddd1aa26c7ad9bb912e016c1bc51278db1343d8"
// 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 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-1760609789-21757@sha256:9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6")
--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-1760939008-21773@sha256:d8d8a3f29f027433bea12764bddd1aa26c7ad9bb912e016c1bc51278db1343d8")
--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