Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kicbase/ISO: Update cri-dockerd from v0.3.3 to v0.3.12 #18585

Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,8 @@ jobs:
sudo apt-get update -qq
sudo apt-get -qq -y install conntrack
sudo apt-get -qq -y install socat
CRI_DOCKERD_VERSION="v0.3.3"
CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
CRI_DOCKERD_VERSION="v0.3.12"
CRI_DOCKERD_COMMIT="c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742"
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}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,8 @@ jobs:
sudo apt-get update -qq
sudo apt-get -qq -y install conntrack
sudo apt-get -qq -y install socat
CRI_DOCKERD_VERSION="v0.3.3"
CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
CRI_DOCKERD_VERSION="v0.3.12"
CRI_DOCKERD_COMMIT="c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742"
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}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
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.33.0-1712138767-18566
ISO_VERSION ?= v1.33.0-1712570768-18585

# 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
Expand Up @@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5
sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz
sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz
sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

CRI_DOCKERD_AARCH64_VER = 0.3.3
CRI_DOCKERD_AARCH64_REV = b58acf8
CRI_DOCKERD_AARCH64_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278
CRI_DOCKERD_AARCH64_VER = 0.3.12
CRI_DOCKERD_AARCH64_REV = c2e3805
CRI_DOCKERD_AARCH64_VERSION = c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742
CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sha256 a2e31a5c8ef122a91c4d4107ba2e0cb4950940f9bbf02ee3020715ba051caef9 0de30fc5
sha256 fc467606256ef13d89365df00a1c4b4b4226628c1a6fd68d2c3fda32bdf36291 9a87d6ae274ecf0f23776920964d6484bd679282.tar.gz
sha256 b01ec9f9953d0017e8728927ebcc46c7ee63e435027b7e67106eb93fc83c387f 23513f4cfe8f02bc02130b4edba2c9d2c8fd320b.tar.gz
sha256 2d491257fb767a413069c7e4e85454c08a9f3456454a8fd840474d44135f5570 b58acf8f78f9d7bce1241d1cddb0932e7101f278.tar.gz
sha256 d83e2c9c7b678e2a2ec7e902e9cf46928e42ef72686f003ae5c85d6dc32ed380 c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

CRI_DOCKERD_VER = 0.3.3
CRI_DOCKERD_REV = b58acf8
CRI_DOCKERD_VERSION = b58acf8f78f9d7bce1241d1cddb0932e7101f278
CRI_DOCKERD_VER = 0.3.12
CRI_DOCKERD_REV = c2e3805
CRI_DOCKERD_VERSION = c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742
CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz

Expand Down
4 changes: 2 additions & 2 deletions deploy/kicbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ FROM ${UBUNTU_JAMMY_IMAGE} as kicbase

ARG BUILDKIT_VERSION="v0.13.1"
ARG CRIO_VERSION="1.24"
ARG CRI_DOCKERD_VERSION="v0.3.3"
ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
ARG CRI_DOCKERD_VERSION="v0.3.12"
ARG CRI_DOCKERD_COMMIT="c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742"
ARG CNI_PLUGINS_VERSION="v1.4.0"
ARG TARGETARCH
ARG NERDCTL_VERSION="1.7.4"
Expand Down
4 changes: 2 additions & 2 deletions hack/jenkins/linux_integration_tests_none.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ if ! which socat &>/dev/null; then
fi

# cri-dockerd is required for Kubernetes v1.24+ with none driver
CRI_DOCKERD_VERSION="0.3.3"
CRI_DOCKERD_VERSION="0.3.12"
if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then
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.service || true
CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
CRI_DOCKERD_COMMIT="c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742"
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}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
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.43-1712138838-18566"
Version = "v0.0.43-1712593525-18585"

// SHA of the kic base image
baseImageSHA = "a1b6bbc384c0914baa698cc91ccedcb662b3c0986082ff16cc623c5d83216034"
baseImageSHA = "82295aae32f93620eb23c604c6fbfbc087f5827d39119a722f4d08f3622b1dfd"
// 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/18566"
isoBucket := "minikube-builds/iso/18585"

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.43-1712138838-18566@sha256:a1b6bbc384c0914baa698cc91ccedcb662b3c0986082ff16cc623c5d83216034")
--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.43-1712593525-18585@sha256:82295aae32f93620eb23c604c6fbfbc087f5827d39119a722f4d08f3622b1dfd")
--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