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.

Sign up for GitHub

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 nerdctl from 1.7.7 to 2.0.2 #20111

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Kicbase/ISO: Update nerdctl from 1.7.7 to 2.0.2 #20111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09bf242
Kicbase/ISO: Update nerdctl from 1.7.7 to 2.0.2
minikube-bot Dec 16, 2024
72ebe32
Updating kicbase image to v0.0.45-1734346113-20111
minikube-bot Dec 16, 2024
744a3af
Updating ISO to v1.34.0-1734369443-20111
minikube-bot Dec 16, 2024
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 Makefile
View file
Open in desktop
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.34.0-1733936888-20083
ISO_VERSION ?= v1.34.0-1734369443-20111

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl
sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz
sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348 nerdctl-1.7.6-linux-arm64.tar.gz
sha256 230ad8f4f88100774d123213a427d3d43071e0dcf9f70efbea50ab9efff1cd4c nerdctl-1.7.7-linux-arm64.tar.gz
sha256 c50ba98be0ef05684948f7873078558504a7cc46ff92cffc764c1625b1cd0d40 nerdctl-2.0.2-linux-arm64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_AARCH64_VERSION = 1.7.7
NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_AARCH64_VERSION = 2.0.2
NERDCTL_BIN_AARCH64_COMMIT = 1220ce7ec2701d485a9b1beeea63dae3da134fb5
NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION)
NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl
sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz
sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0 nerdctl-1.7.6-linux-amd64.tar.gz
sha256 298bb95aee485b24d566115ef7e4e90951dd232447b05de5646a652a23db70a9 nerdctl-1.7.7-linux-amd64.tar.gz
sha256 1ba015dba039cf6ec2434e88d97707f0b715790e6b7f2e7b6ff7be9200f47bc1 nerdctl-2.0.2-linux-amd64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_VERSION = 1.7.7
NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_VERSION = 2.0.2
NERDCTL_BIN_COMMIT = 1220ce7ec2701d485a9b1beeea63dae3da134fb5
NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION)
NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
NERDCTL_BIN_STRIP_COMPONENTS = 0
Expand Down
2 changes: 1 addition & 1 deletion deploy/kicbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.15"
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
ARG CNI_PLUGINS_VERSION="v1.4.0"
ARG TARGETARCH
ARG NERDCTL_VERSION="1.7.7"
ARG NERDCTL_VERSION="2.0.2"
ARG NERDCTLD_VERSION="0.6.1"

# copy in static files (configs, scripts)
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Open in desktop
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.45-1733912881-20083"
Version = "v0.0.45-1734346113-20111"

// SHA of the kic base image
baseImageSHA = "64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2"
baseImageSHA = "e1bd3637409ab525a43e32bbe4157fe8b7cdc3139cafb0d14df877678a488ba1"
// 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
View file
Open in desktop
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/20083"
isoBucket := "minikube-builds/iso/20111"

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
View file
Open in desktop
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.45-1733912881-20083@sha256:64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2")
--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.45-1734346113-20111@sha256:e1bd3637409ab525a43e32bbe4157fe8b7cdc3139cafb0d14df877678a488ba1")
--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