Skip to content

Commit 72ddb05

Browse files
medyaghmedyagh
authored
Merge pull request #21974 from divysinghvi/integration-dcoker-containerd
ci: Added docker-containerd-linux-x86-64 tests to prow
2 parents bc5cd1d + fe1e83c commit 72ddb05

File tree

7 files changed

+59
-8
lines changed

7 files changed

+59
-8
lines changed

‎deploy/kicbase/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ RUN install -m 0755 -d /etc/apt/keyrings \
172172
tee /etc/apt/sources.list.d/docker.list > /dev/null \
173173
&& clean-install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
174174

175+
# Set ulimit for containerd to match docker's default-ulimit setting
176+
# This ensures consistent file descriptor limits (1048576) across container runtimes
177+
RUN sed -i '/^\[Service\]/a LimitNOFILE=1048576' /lib/systemd/system/containerd.service
178+
175179
# install buildkit
176180
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
177181
&& echo "Installing buildkit ..." \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ ii diffutils 1:3.8-4 amd64
3535
ii dirmngr 2.2.40-1.1+deb12u1 amd64 GNU privacy guard - network certificate management service
3636
ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library
3737
ii dnsutils 1:9.18.41-1~deb12u1 all Transitional package for bind9-dnsutils
38-
ii docker-buildx-plugin 0.30.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
39-
ii docker-ce 5:29.1.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine
40-
ii docker-ce-cli 5:29.1.1-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
38+
ii docker-buildx-plugin 0.30.0-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
39+
ii docker-ce 5:29.0.4-1~debian.12~bookworm amd64 Docker: the open-source application container engine
40+
ii docker-ce-cli 5:29.0.4-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
4141
ii dpkg 1.21.22 amd64 Debian package management system
4242
ii e2fsprogs 1.47.0-2+b2 amd64 ext2/ext3/ext4 file system utilities
4343
ii ebtables 2.0.11-5 amd64 Ethernet bridge frame table administration

‎hack/prow/integration_docker_containerd_linux_x86-64.sh‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Copyright 2025 The Kubernetes Authors All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -e
18+
set -x
19+
20+
OS="linux"
21+
ARCH="amd64"
22+
DRIVER="docker"
23+
CONTAINER_RUNTIME="containerd"
24+
EXTRA_START_ARGS=""
25+
EXTRA_TEST_ARGS=""
26+
JOB_NAME="Docker_Containerd_Linux_x86-64"
27+
28+
git config --global --add safe.directory '*'
29+
COMMIT=$(git rev-parse HEAD)
30+
MINIKUBE_LOCATION=$COMMIT
31+
32+
33+
# when docker is the driver, we run integration tests directly in prow cluster
34+
# by default, prow jobs run in root, so we must switch to a non-root user to run docker driver
35+
36+
37+
source ./hack/prow/common.sh

‎hack/prow/prow.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ integration-prow-docker-docker-linux-x86-64:
33
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
44
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_docker_linux_x86-64.sh
55

6+
integration-prow-docker-containerd-linux-x86-64:
7+
# build first
8+
# container-runtime=containerd driver=docker on linux/amd64
9+
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
10+
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_containerd_linux_x86-64.sh
11+
612
.PHONY: integration-prow-none-docker-linux-x86-64
713
integration-prow-none-docker-linux-x86-64: setup-prow-gcp-ssh-keys build-mini-test
814
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64

‎hack/prow/util/integration_prow_wrapper.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ echo "test finished with exit code $result"
2424

2525
items=("testout.txt" "test.json" "junit-unit.xml" "test.html" "test_summary.json")
2626
for item in "${items[@]}"; do
27-
echo "Collecting ${item} to ${ARTIFACTS}/${item}"
28-
cp "${item}" "${ARTIFACTS}/${item}"
27+
if [ -f "${item}" ]; then
28+
echo "Collecting ${item} to ${ARTIFACTS}/${item}"
29+
cp "${item}" "${ARTIFACTS}/${item}"
30+
else
31+
echo "Warning: ${item} not found, skipping"
32+
fi
2933
done
3034
exit $result

‎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-1764404984-22005"
27+
Version = "v0.0.48-1764169655-21974"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "dca6090a32d4a02514b0c3cca14181e72caa28caf2bacae99dc005294e7af7a6"
30+
baseImageSHA = "5caa2df9c71885b15a10c4769bf4c9c00c1759c0d87b1a7e0b5b61285526245b"
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-1764404984-22005@sha256:dca6090a32d4a02514b0c3cca14181e72caa28caf2bacae99dc005294e7af7a6")
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-1764169655-21974@sha256:5caa2df9c71885b15a10c4769bf4c9c00c1759c0d87b1a7e0b5b61285526245b")
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)