Merge pull request #17071 from spowelljr/release1312

Release v1.31.2

Author: spowelljr

CHANGELOG.md

@@ -1,5 +1,59 @@
 # Release Notes
 
+## Version 1.31.2 - 2023-08-16
+
+docker-env Regression:
+* Create `~/.ssh` directory if missing [#16934](https://github.com/kubernetes/minikube/pull/16934)
+* Fix adding guest to `~/.ssh/known_hosts` when not needed [#17030](https://github.com/kubernetes/minikube/pull/17030)
+
+Minor Improvements:
+* Verify containerd storage separately from docker [#16972](https://github.com/kubernetes/minikube/pull/16972)
+
+Version Upgrades:
+* Bump Kubernetes version default: v1.27.4 and latest: v1.28.0-rc.1 [#17011](https://github.com/kubernetes/minikube/pull/17011) [#17051](https://github.com/kubernetes/minikube/pull/17051)
+* Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.7 to 1.5.9 [#17017](https://github.com/kubernetes/minikube/pull/17017) [#17044](https://github.com/kubernetes/minikube/pull/17044)
+* Addon headlamp: Update headlamp-k8s/headlamp image from v0.18.0 to v0.19.0 [#16992](https://github.com/kubernetes/minikube/pull/16992)
+* Addon inspektor-gadget: Update inspektor-gadget image from v0.18.1 to v0.19.0 [#17016](https://github.com/kubernetes/minikube/pull/17016)
+* Addon metrics-server: Update metrics-server/metrics-server image from v0.6.3 to v0.6.4 [#16969](https://github.com/kubernetes/minikube/pull/16969)
+* CNI flannel: Update from v0.22.0 to v0.22.1 [#16968](https://github.com/kubernetes/minikube/pull/16968)
+
+For a more detailed changelog, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md).
+
+Thank you to our contributors for this release!
+
+- Alex Serbul
+- Anders F Björklund
+- Jeff MAURY
+- Medya Ghazizadeh
+- Michelle Thompson
+- Predrag Rogic
+- Seth Rylan Gainey
+- Steven Powell
+- aiyijing
+- joaquimrocha
+- renyanda
+- shixiuguo
+- sunyuxuan
+- Товарищ программист
+
+Thank you to our PR reviewers for this release!
+
+- medyagh (8 comments)
+- spowelljr (2 comments)
+- ComradeProgrammer (1 comments)
+- Lyllt8 (1 comments)
+- aiyijing (1 comments)
+
+Thank you to our triage members for this release!
+
+- afbjorklund (6 comments)
+- vaibhav2107 (5 comments)
+- kundan2707 (3 comments)
+- spowelljr (3 comments)
+- ao390 (2 comments)
+
+Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.31.2/) for this release!
+
 ## Version 1.31.1 - 2023-07-20
 
 * cni: Fix regression in auto selection [#16912](https://github.com/kubernetes/minikube/pull/16912)

Makefile

@@ -15,15 +15,15 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 31
-VERSION_BUILD ?= 1
+VERSION_BUILD ?= 2
 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.31.0-1690838458-16971
+ISO_VERSION ?= v1.31.0
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

cmd/minikube/cmd/start.go

@@ -446,6 +446,7 @@ func imageMatchesBinaryVersion(imageVersion, binaryVersion string) bool {
 
 	mappedVersions := map[string]string{
 		"v1.31.1": "v1.31.0",
+		"v1.31.2": "v1.31.0",
 	}
 	binaryVersion, ok := mappedVersions[binaryVersion]
 

pkg/drivers/kic/types.go

@@ -24,14 +24,14 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.40-1690799191-16971"
+	Version = "v0.0.40"
 
 	// SHA of the kic base image
-	baseImageSHA = "e2b8a0768c6a1fd3ed0453a7caf63756620121eab0a25a3ecf9665353865fd37"
+	baseImageSHA = "8cadf23777709e43eca447c47a45f5a4635615129267ce025193040ec92a1631"
 	// The name of the GCR kicbase repository
-	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
+	gcrRepo = "gcr.io/k8s-minikube/kicbase"
 	// The name of the Dockerhub kicbase repository
-	dockerhubRepo = "docker.io/kicbase/build"
+	dockerhubRepo = "docker.io/kicbase/stable"
 )
 
 var (

site/content/en/docs/commands/start.md

@@ -26,7 +26,7 @@ minikube start [flags]
       --apiserver-names strings           A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine
       --apiserver-port int                The apiserver listening port (default 8443)
       --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.40-1690799191-16971@sha256:e2b8a0768c6a1fd3ed0453a7caf63756620121eab0a25a3ecf9665353865fd37")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.40@sha256:8cadf23777709e43eca447c47a45f5a4635615129267ce025193040ec92a1631")
       --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)