Merge branch 'kubernetes:master' into master

cambridgesemantics · Nov 13, 2023 · f58b182 · f58b182
2 parents 801f0d9 + 6425be8
commit f58b182
Show file tree

Hide file tree

Showing 28 changed files with 673 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,49 @@
 # Release Notes
 
+## Version 1.32.0 - 2023-11-07
+
+Features:
+* rootless: support `--container-runtime=docker` [#17520](https://github.com/kubernetes/minikube/pull/17520)
+
+Minor Improvements:
+* Install NVIDIA container toolkit during image build (offline support) [#17516](https://github.com/kubernetes/minikube/pull/17516)
+
+Bugs:
+* Fix no-limit option for config validation [#17530](https://github.com/kubernetes/minikube/pull/17530)
+
+Version Upgrades:
+* Addon ingress: Update ingress-nginx/controller image from v1.9.3 to v1.9.4 [#17525](https://github.com/kubernetes/minikube/pull/17525)
+* Addon inspektor-gadget: Update inspektor-gadget image from v0.21.0 to v0.22.0 [#17550](https://github.com/kubernetes/minikube/pull/17550)
+* Addon kong: Update kong/kubernetes-ingress-controller image from 2.9.3 to 2.12.0 [#17526](https://github.com/kubernetes/minikube/pull/17526)
+* Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from v0.14.1 to v0.14.2 [#17523](https://github.com/kubernetes/minikube/pull/17523)
+* Kicbase/ISO: Update buildkit from v0.12.2 to v0.12.3 [#17486](https://github.com/kubernetes/minikube/pull/17486)
+* Kicbase/ISO: Update containerd from v1.7.7 to v1.7.8 [#17527](https://github.com/kubernetes/minikube/pull/17527)
+* Kicbase/ISO: Update docker from 24.0.6 to 24.0.7 [#17545](https://github.com/kubernetes/minikube/pull/17545)
+
+For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md).
+
+Thank you to our contributors for this release!
+
+- Akihiro Suda
+- Christian Bergschneider
+- Jeff MAURY
+- Medya Ghazizadeh
+- Raiden Shogun
+- Steven Powell
+
+Thank you to our PR reviewers for this release!
+
+- medyagh (1 comments)
+- r0b2g1t (1 comments)
+
+Thank you to our triage members for this release!
+
+- willsu (2 comments)
+- afbjorklund (1 comments)
+- ankur0904 (1 comments)
+- ceelian (1 comments)
+- idoly (1 comments)
+
 ## Version 1.32.0-beta0 - 2023-10-27
 
 Features:

diff --git a/Makefile b/Makefile
@@ -15,15 +15,15 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 32
-VERSION_BUILD ?= 0-beta.0
+VERSION_BUILD ?= 0
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 
 KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/constants/constants.go | cut -d \" -f2)
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.32.0-1698920115-17545
+ISO_VERSION ?= v1.32.1-1699485311-17565
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -78,7 +78,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 KERNEL_VERSION ?= 5.10.57
 # latest from https://github.com/golangci/golangci-lint/releases
 # update this only by running `make update-golint-version`
-GOLINT_VERSION ?= v1.55.1
+GOLINT_VERSION ?= v1.55.2
 # Limit number of default jobs, to avoid the CI builds running out of memory
 GOLINT_JOBS ?= 4
 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint

diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash
@@ -2,3 +2,4 @@ sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1  nerdctl
 sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7  nerdctl-1.5.0-linux-arm64.tar.gz
 sha256 d5f1ed3cda151385d313f9007afc708cae0018c9da581088b092328db154d0c6  nerdctl-1.6.0-linux-arm64.tar.gz
 sha256 ece848045290dd61f542942248587e91125563af46c0ea972a7c908d0d39c96c  nerdctl-1.6.2-linux-arm64.tar.gz
+sha256 1255eea5bc2dbac9339d0a9acfb0651dda117504d52cd52b38cf3c2251db4f39  nerdctl-1.7.0-linux-arm64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NERDCTL_BIN_AARCH64_VERSION = 1.6.2
-NERDCTL_BIN_AARCH64_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794
+NERDCTL_BIN_AARCH64_VERSION = 1.7.0
+NERDCTL_BIN_AARCH64_COMMIT = e674fe7ba6e49f12e88cd9c6c442e7ea5232502c
 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

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash
@@ -2,3 +2,4 @@ sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc  nerdctl
 sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1  nerdctl-1.5.0-linux-amd64.tar.gz
 sha256 fc3e7eef775eff85eb6c16b2761a574e83de444831312bc92e755a1f5577872d  nerdctl-1.6.0-linux-amd64.tar.gz
 sha256 67991fc144b03596f15be6c20ca112d10bd92ad467414e95b0f1d60d332ae34e  nerdctl-1.6.2-linux-amd64.tar.gz
+sha256 844c47b175a3d6bc8eaad0c51f23624a5ef10c09e55607803ec2bc846fb04df9  nerdctl-1.7.0-linux-amd64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk
@@ -4,8 +4,8 @@
 # 
 ################################################################################
 
-NERDCTL_BIN_VERSION = 1.6.2
-NERDCTL_BIN_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794
+NERDCTL_BIN_VERSION = 1.7.0
+NERDCTL_BIN_COMMIT = e674fe7ba6e49f12e88cd9c6c442e7ea5232502c
 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

diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
@@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3"
 ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
 ARG CNI_PLUGINS_VERSION="v1.3.0"
 ARG TARGETARCH
-ARG NERDCTL_VERSION="1.6.2"
+ARG NERDCTL_VERSION="1.7.0"
 ARG NERDCTLD_VERSION="0.2.0"
 
 # copy in static files (configs, scripts)

diff --git a/deploy/minikube/releases-v2.json b/deploy/minikube/releases-v2.json
@@ -1,4 +1,30 @@
 [
+    {
+        "checksums": {
+            "amd64": {
+                "darwin": "8ca4b2cce6208f102b851d0ea8292c1324e8358b7ac208dd1079e41af558def8",
+                "linux": "1acbb6e0358264a3acd5e1dc081de8d31c697d5b4309be21cba5587cd59eabb3",
+                "windows": "d4060da824524df744ba85fa91394cabfab15f110c03b1d8b7f1d309116fed15"
+            },
+            "arm": {
+                "linux": "fc181cb6f1bcda786001e7f7f46f810e8b430abc7d16bbe257c0526f23f90f00"
+            },
+            "arm64": {
+                "darwin": "f5bf38603b01cc3eb88f21d5550068fd592486c08c0f3272aee544e0bc2e4e64",
+                "linux": "77ca98722819e2e9d94925f662f348c3d41c1831c3cd3a77732093d7f509f172"
+            },
+            "ppc64le": {
+                "linux": "3072cce0952628187511748b4b8fc2080e80327384b30e8c6df465f02c8f35ce"
+            },
+            "s390x": {
+                "linux": "0eb342fe581afb106b6013401b33429607ab40f57f5e48a15f2b2e04726edc57"
+            },
+            "darwin": "8ca4b2cce6208f102b851d0ea8292c1324e8358b7ac208dd1079e41af558def8",
+            "linux": "1acbb6e0358264a3acd5e1dc081de8d31c697d5b4309be21cba5587cd59eabb3",
+            "windows": "d4060da824524df744ba85fa91394cabfab15f110c03b1d8b7f1d309116fed15"
+        },
+        "name": "v1.32.0"
+    },
     {
         "checksums": {
             "amd64": {

diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json
@@ -1,4 +1,12 @@
 [
+    {
+        "checksums": {
+            "darwin": "8ca4b2cce6208f102b851d0ea8292c1324e8358b7ac208dd1079e41af558def8",
+            "linux": "1acbb6e0358264a3acd5e1dc081de8d31c697d5b4309be21cba5587cd59eabb3",
+            "windows": "d4060da824524df744ba85fa91394cabfab15f110c03b1d8b7f1d309116fed15"
+        },
+        "name": "v1.32.0"
+    },
     {
         "checksums": {
             "darwin": "c655de8bf27557f706f196a08a0afb8730e98c4976207542e05b73c11bcc0b38",

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module k8s.io/minikube
 go 1.21
 
 require (
-	cloud.google.com/go/storage v1.34.1
+	cloud.google.com/go/storage v1.35.1
 	contrib.go.opencensus.io/exporter/stackdriver v0.13.14
 	github.com/Delta456/box-cli-maker/v2 v2.3.0
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.20.0
@@ -25,7 +25,7 @@ require (
 	github.com/google/slowjam v1.1.0
 	github.com/google/uuid v1.4.0
 	github.com/hashicorp/go-getter v1.7.3
-	github.com/hashicorp/go-retryablehttp v0.7.4
+	github.com/hashicorp/go-retryablehttp v0.7.5
 	github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
 	github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect
 	github.com/hooklift/iso9660 v1.0.0
@@ -49,7 +49,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 	github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.10
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.17.0
 	github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
@@ -58,16 +58,16 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
-	golang.org/x/crypto v0.14.0
+	golang.org/x/crypto v0.15.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
-	golang.org/x/mod v0.13.0
-	golang.org/x/oauth2 v0.13.0
-	golang.org/x/sync v0.4.0
-	golang.org/x/sys v0.13.0
-	golang.org/x/term v0.13.0
-	golang.org/x/text v0.13.0
+	golang.org/x/mod v0.14.0
+	golang.org/x/oauth2 v0.14.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.14.0
+	golang.org/x/term v0.14.0
+	golang.org/x/text v0.14.0
 	gonum.org/v1/plot v0.14.0
-	google.golang.org/api v0.149.0
+	google.golang.org/api v0.150.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.28.3
 	k8s.io/apimachinery v0.28.3
@@ -93,7 +93,7 @@ require (
 	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
 	github.com/juju/mutex/v2 v2.0.0
 	github.com/moby/patternmatcher v0.6.0
-	github.com/opencontainers/runc v1.1.9
+	github.com/opencontainers/runc v1.1.10
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
 )
 
@@ -120,7 +120,7 @@ require (
 	github.com/containerd/containerd v1.6.19 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
@@ -214,14 +214,14 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/image v0.11.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.13.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect