kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18869 from minikube-bot/auto_bump_nerdctl_version-7777113 

Kicbase/ISO: Update nerdctl from 1.7.5 to 1.7.6
pull/18886/head
Steven Powell 2024-05-14 09:59:19 -07:00 committed by GitHub
parent c2c22e104b 71ba49b208
commit 7f4eaed9c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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.1
ISO_VERSION ?= v1.33.1-1715594774-18869
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

1
deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash
View File

@ -7,3 +7,4 @@ sha256 46affa0564bb74f595a817e7d5060140099d9cfd9e00e1272b4dbe8b0b85c655 nerdctl
sha256 de68d5380d65604cd26c164988547cf46b698f7819a5d51d98e3a0f031f5594d nerdctl-1.7.2-linux-arm64.tar.gz
sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl-1.7.4-linux-arm64.tar.gz
sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz
sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348 nerdctl-1.7.6-linux-arm64.tar.gz

4
deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
NERDCTL_BIN_AARCH64_VERSION = 1.7.5
NERDCTL_BIN_AARCH64_COMMIT = cffed372371dcbea3dc9a646ce5a913fc1c09513
NERDCTL_BIN_AARCH64_VERSION = 1.7.6
NERDCTL_BIN_AARCH64_COMMIT = 845e989f69d25b420ae325fedc8e70186243fd93
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

1
deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash
View File

@ -7,3 +7,4 @@ sha256 5fc0a6e8c3a71cbba95fbdb6833fb8a7cd8e78f53de10988362d4029c14b905a nerdctl
sha256 aed7d33d645bfb97c8df978d952a1e1f7e02b0b3ed2c0089ee4285af7f8f971b nerdctl-1.7.2-linux-amd64.tar.gz
sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl-1.7.4-linux-amd64.tar.gz
sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz
sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0 nerdctl-1.7.6-linux-amd64.tar.gz

4
deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
NERDCTL_BIN_VERSION = 1.7.5
NERDCTL_BIN_COMMIT = cffed372371dcbea3dc9a646ce5a913fc1c09513
NERDCTL_BIN_VERSION = 1.7.6
NERDCTL_BIN_COMMIT = 845e989f69d25b420ae325fedc8e70186243fd93
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

2
deploy/kicbase/Dockerfile
View File

@ -47,7 +47,7 @@ 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.5"
ARG NERDCTL_VERSION="1.7.6"
ARG NERDCTLD_VERSION="0.6.0"
# copy in static files (configs, scripts)

8
pkg/drivers/kic/types.go
View File

@ -24,14 +24,14 @@ import (
const (
// Version is the current version of kic
Version = "v0.0.44"
Version = "v0.0.44-1715596048-18869"
// SHA of the kic base image
baseImageSHA = "eb04641328b06c5c4a14f4348470e1046bbcf9c2cbc551486e343d3a49db557e"
baseImageSHA = "21f587e50c9b687cd453b50e19841464a370320687b1e0638f9fff50ff42a455"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase"
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
dockerhubRepo = "docker.io/kicbase/stable"
dockerhubRepo = "docker.io/kicbase/build"
)
var (

2
pkg/minikube/download/iso.go
View File

@ -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/iso"
isoBucket := "minikube-builds/iso/18869"
return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

2
site/content/en/docs/commands/start.md
View File

@ -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:v0.0.44@sha256:eb04641328b06c5c4a14f4348470e1046bbcf9c2cbc551486e343d3a49db557e")
--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.44-1715596048-18869@sha256:21f587e50c9b687cd453b50e19841464a370320687b1e0638f9fff50ff42a455")
--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)