Skip to content

Commit ec7f42e

Browse files
medyaghmedyagh
authored
Merge pull request #21773 from afbjorklund/crio-depends
Remove old obsolete Podman kubic repository
2 parents 30a5931 + 8990789 commit ec7f42e

File tree

4 files changed

+6
-27
lines changed

4 files changed

+6
-27
lines changed

‎deploy/kicbase/Dockerfile‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ RUN clean-install \
137137
gnupg \
138138
sudo \
139139
openssh-server \
140-
dnsutils \
141-
# libglib2.0-0 is required for conmon, which is required for podman
142-
libglib2.0-0
140+
dnsutils
143141

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

196194
# install podman
197-
RUN clean-install podman && \
195+
RUN clean-install podman catatonit crun && \
198196
addgroup --system podman && \
199197
mkdir -p /etc/systemd/system/podman.socket.d && \
200198
printf "[Socket]\nSocketMode=0660\nSocketUser=root\nSocketGroup=podman\n" \
@@ -222,17 +220,6 @@ RUN export ARCH=$(dpkg --print-architecture) && \
222220
else \
223221
echo "Skipping crictl install for armhf: No asset available in v1.34.0"; \
224222
fi
225-
# install cri-o dependencies:
226-
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
227-
mkdir -p /etc/apt/keyrings && \
228-
curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/Release.key | \
229-
gpg --dearmor --yes -o /etc/apt/keyrings/libcontainers-archive-keyring.gpg && \
230-
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" && \
231-
if [ "$ARCH" != "ppc64le" ]; then \
232-
clean-install catatonit crun; \
233-
else \
234-
clean-install crun; \
235-
fi
236223
# install containernetworking-plugins
237224
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm/') && \
238225
curl -LO "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz" && \

‎hack/kicbase_version/os-package-list.txt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ ii containerd.io 1.7.28-1~debian.12~bookworm amd64
2020
ii containernetworking-plugins 1.1.1+ds1-3+b5 amd64 standard networking plugins - binaries
2121
ii coreutils 9.1-1 amd64 GNU core utilities
2222
ii cri-o 1.34.1-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
23-
ii criu 4.1.1-3 amd64 checkpoint and restore in userspace
24-
ii crun 100:1.2-2 amd64 OCI runtime written in C
23+
ii crun 1.8.1-1+deb12u1 amd64 lightweight OCI runtime for running containers
2524
ii curl 7.88.1-10+deb12u14 amd64 command line tool for transferring data with URL syntax
2625
ii dash 0.5.12-2 amd64 POSIX-compliant shell
2726
ii dbus 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (system message bus)
@@ -115,7 +114,6 @@ ii libicu72:amd64 72.1-3+deb12u1 amd64
115114
ii libidn2-0:amd64 2.3.3-1+b1 amd64 Internationalized domain names (IDNA2008/TR46) library
116115
ii libip4tc2:amd64 1.8.9-2 amd64 netfilter libip4tc library
117116
ii libip6tc2:amd64 1.8.9-2 amd64 netfilter libip6tc library
118-
ii libjansson4:amd64 2.14-2 amd64 C library for encoding, decoding and manipulating JSON data
119117
ii libjemalloc2:amd64 5.3.0-1 amd64 general-purpose scalable concurrent malloc(3) implementation
120118
ii libjson-c5:amd64 0.16-2 amd64 JSON manipulation library - shared library
121119
ii libk5crypto3:amd64 1.20.1-2+deb12u4 amd64 MIT Kerberos runtime libraries - Crypto Library
@@ -133,15 +131,12 @@ ii libmd0:amd64 1.0.4-2 amd64
133131
ii libmnl0:amd64 1.0.4-3 amd64 minimalistic Netlink communication library
134132
ii libmount1:amd64 2.38.1-5+deb12u3 amd64 device mounting library
135133
ii libncursesw6:amd64 6.4-4 amd64 shared libraries for terminal handling (wide character support)
136-
ii libnet1:amd64 1.1.6+dfsg-3.2 amd64 library for the construction and handling of network packets
137134
ii libnetfilter-conntrack3:amd64 1.0.9-3 amd64 Netfilter netlink-conntrack library
138135
ii libnettle8:amd64 3.8.1-2 amd64 low level cryptographic library (symmetric and one-way cryptos)
139136
ii libnfnetlink0:amd64 1.0.2-2 amd64 Netfilter netlink library
140137
ii libnfsidmap1:amd64 1:2.6.2-4+deb12u1 amd64 NFS idmapping library
141-
ii libnftables1:amd64 1.0.6-2+deb12u2 amd64 Netfilter nftables high level userspace API library
142138
ii libnftnl11:amd64 1.2.4-2 amd64 Netfilter nftables userspace API library
143139
ii libnghttp2-14:amd64 1.52.0-1+deb12u2 amd64 library implementing HTTP/2 protocol (shared library)
144-
ii libnl-3-200:amd64 3.7.0-0.2+b1 amd64 library for dealing with netlink sockets
145140
ii libnpth0:amd64 1.6-3 amd64 replacement for GNU Pth using system threads
146141
ii libnsl2:amd64 1.3.0-2 amd64 Public client interface for NIS(YP) and NIS+
147142
ii libnvidia-container-tools 1.17.9-1 amd64 NVIDIA container runtime library (command-line tools)
@@ -155,7 +150,6 @@ ii libpcre2-8-0:amd64 10.42-1 amd64
155150
ii libpopt0:amd64 1.19+dfsg-1 amd64 lib for parsing cmdline parameters
156151
ii libproc2-0:amd64 2:4.0.2-3 amd64 library for accessing process information from /proc
157152
ii libprotobuf-c1:amd64 1.4.1-1+b1 amd64 Protocol Buffers C shared library (protobuf-c)
158-
ii libprotobuf32:amd64 3.21.12-3 amd64 protocol buffers C++ library
159153
ii libpsl5:amd64 0.21.2-1 amd64 Library for Public Suffix List (shared libraries)
160154
ii libpython3-stdlib:amd64 3.11.2-1+b1 amd64 interactive high-level object-oriented language (default python3 version)
161155
ii libpython3.11-minimal:amd64 3.11.2-6+deb12u6 amd64 Minimal subset of the Python language (version 3.11)
@@ -217,7 +211,6 @@ ii podman 4.3.1+ds1-8+deb12u1+b1 amd64
217211
ii procps 2:4.0.2-3 amd64 /proc file system utilities
218212
ii python3 3.11.2-1+b1 amd64 interactive high-level object-oriented language (default python3 version)
219213
ii python3-minimal 3.11.2-1+b1 amd64 minimal subset of the Python language (default python3 version)
220-
ii python3-protobuf 3.21.12-3 amd64 Python 3 bindings for protocol buffers
221214
ii python3.11 3.11.2-6+deb12u6 amd64 Interactive high-level object-oriented language (version 3.11)
222215
ii python3.11-minimal 3.11.2-6+deb12u6 amd64 Minimal subset of the Python language (version 3.11)
223216
ii readline-common 8.2-1.3 all GNU readline and history libraries, common files
@@ -226,7 +219,6 @@ ii rsync 3.2.7-1+deb12u2 amd64
226219
ii runit-helper 2.15.2 all dh-runit implementation detail
227220
ii sed 4.9-1 amd64 GNU stream editor for filtering/transforming text
228221
ii sensible-utils 0.0.17+nmu1 all Utilities for sensible alternative selection
229-
ii sgml-base 1.31 all SGML infrastructure and SGML catalog file support
230222
ii socat 1.7.4.4-2 amd64 multipurpose relay for bidirectional data transfer
231223
ii sudo 1.9.13p3-1+deb12u2 amd64 Provide limited super user privileges to specific users
232224
ii systemd 252.39-1~deb12u1 amd64 system and service manager

‎pkg/drivers/kic/types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.48-1760609789-21757"
27+
Version = "v0.0.48-1760939008-21773"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6"
30+
baseImageSHA = "d8d8a3f29f027433bea12764bddd1aa26c7ad9bb912e016c1bc51278db1343d8"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

‎site/content/en/docs/commands/start.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--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")
30+
--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")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)