From 3a8096d0ec4de640ed594966f8303080ecc17212 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 26 Jan 2023 12:29:52 -0800
Subject: [PATCH 1/3] release v1.29.0

---
 CHANGELOG.md | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile     |   2 +-
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa8bcee25c..7b514899f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,110 @@
 # Release Notes
 
+## Version 1.29.0 - 2023-01-26
+
+Features:
+* Graduate QEMU driver from experimental to GA [#15556](https://github.com/kubernetes/minikube/pull/15556)
+* Implement --static-ip flag (Docker only) [#15553](https://github.com/kubernetes/minikube/pull/15553)
+* Implement Kicbase/ISO version validation when starting existing clusters [#15235](https://github.com/kubernetes/minikube/pull/15235)
+* GCP-Auth addon automatically integrates with newly created namespaces [#15403](https://github.com/kubernetes/minikube/pull/15403)
+* Large improvements to cgroup detection and CNI and CRI configurations [#15463](https://github.com/kubernetes/minikube/pull/15463)
+
+Minor Improvements:
+* Prevent redownloading kicbase when already downloaded [#15528](https://github.com/kubernetes/minikube/pull/15528)
+* Check brew install paths for socket_vmnet [#15701](https://github.com/kubernetes/minikube/pull/15701)
+* Include gcp-auth logs in 'minikube logs' output [#15666](https://github.com/kubernetes/minikube/pull/15666)
+* Use absolute path when calling crictl version [#15642](https://github.com/kubernetes/minikube/pull/15642)
+* Allow forcing 1 CPU on Linux with docker and none driver [#15611](https://github.com/kubernetes/minikube/pull/15611) [#15610](https://github.com/kubernetes/minikube/pull/15610)
+* Add additional memory overhead for VirtualBox when `--memory=max` [#15317](https://github.com/kubernetes/minikube/pull/15317)
+* Update Windows installer to create system-wide shortcut [#15405](https://github.com/kubernetes/minikube/pull/15405)
+* Add `--subnet` validation [#15530](https://github.com/kubernetes/minikube/pull/15530)
+* Warn users if using VirtualBox on macOS 13+ [#15624](https://github.com/kubernetes/minikube/pull/15624)
+* Add groups check to SSH driver [#15513](https://github.com/kubernetes/minikube/pull/15513)
+* Update references to deprecated beta.kubernetes.io [#15225](https://github.com/kubernetes/minikube/pull/15225)
+
+Bugs:
+* Fix possible race condition when enabling multiple addons [#15706](https://github.com/kubernetes/minikube/pull/15706)
+* Fix cpus config field not supporting max value [#15479](https://github.com/kubernetes/minikube/pull/15479)
+* Fix subnet checking failing if IPv6 network found [#15394](https://github.com/kubernetes/minikube/pull/15394)
+* Fix Docker tunnel failing if too many SSH keys [#15560](https://github.com/kubernetes/minikube/pull/15560)
+* Fix kubelet localStorageCapacityIsolation option [#15336](https://github.com/kubernetes/minikube/pull/15336)
+* Fix setting snapshotter to unimplemented fuse-overlayfs [#15272](https://github.com/kubernetes/minikube/pull/15272)
+* Remove progress bar for kic download with JSON output [#15482](https://github.com/kubernetes/minikube/pull/15482)
+
+Version Upgrades:
+* Bump default Kubernetes version from 1.25.3 to 1.26.1 [#15683](https://github.com/kubernetes/minikube/pull/15683)
+* Addons: Update auto-pause from 0.0.2 to 0.0.3 [#15331](https://github.com/kubernetes/minikube/pull/15331)
+* Addons: Update cloud-spanner from 1.4.6 to 1.5.0 [#15440](https://github.com/kubernetes/minikube/pull/15440) [#15667](https://github.com/kubernetes/minikube/pull/15667) [#15707](https://github.com/kubernetes/minikube/pull/15707)
+* Addons: Update headlamp from 0.13.0 to 0.14.1 [#15401](https://github.com/kubernetes/minikube/pull/15401) [#15515](https://github.com/kubernetes/minikube/pull/15515)
+* Addons: Update ingress from 1.2.1 to 1.5.1 [#15339](https://github.com/kubernetes/minikube/pull/15339)
+* Addons: Update metrics-server from 0.6.1 to 0.6.2 [#15411](https://github.com/kubernetes/minikube/pull/15411)
+* Addons: Update kubevirt from 1.17 to 1.24.7 [#15310](https://github.com/kubernetes/minikube/pull/15310)
+* CNI: Update cilium from 1.9.9 to 1.12.3 [#15242](https://github.com/kubernetes/minikube/pull/15242)
+* Kicbase: Update buildkit from 0.10.3 to v0.11.0 [#15630](https://github.com/kubernetes/minikube/pull/15630)
+* Kicbase/ISO: Update containerd from 1.6.9 to 1.6.15 [#15541](https://github.com/kubernetes/minikube/pull/15541)
+* Kicbase/ISO: Update cri-dockerd from 0.2.2 to 0.3.0 [#15541](https://github.com/kubernetes/minikube/pull/15541)
+* Kicbase/ISO: Update docker from 20.10.20 to 20.10.23 [#15341](https://github.com/kubernetes/minikube/pull/15341) [#15541](https://github.com/kubernetes/minikube/pull/15541) [#15703](https://github.com/kubernetes/minikube/pull/15703)
+* Update KVM-docker-machine amd64 base image from Ubuntu 16.04 to 20.04 [#15628](https://github.com/kubernetes/minikube/pull/15628)
+
+
+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!
+
+- Aarav Arora
+- Akihiro Suda
+- Anders F Björklund
+- Andrew Stanton
+- Carlos Santana
+- Chris Kannon
+- Eng Zer Jun
+- Felipe Labbate
+- Ian Stewart
+- Jan Hutař
+- Jeff MAURY
+- Kaylen Dart
+- Kush Mansingh
+- Ludovic Maître
+- Medya Ghazizadeh
+- Olivier Lemasle
+- Paco Xu
+- Paul S. Schweigert
+- Predrag Rogic
+- Ronnel Santiago
+- Sharif Elgamal
+- Shubh Bapna
+- Steven Powell
+- Yuiko Mouri
+- ckannon
+- imjoseangel
+- joaquimrocha
+- jongwooo
+- mardi2020
+- shixiuguo
+- Товарищ программист
+
+Thank you to our PR reviewers for this release!
+
+- spowelljr (61 comments)
+- medyagh (41 comments)
+- afbjorklund (7 comments)
+- atoato88 (5 comments)
+- t-inu (5 comments)
+- mqasimsarfraz (4 comments)
+- AkihiroSuda (2 comments)
+- sharifelgamal (2 comments)
+- profnandaa (1 comments)
+
+Thank you to our triage members for this release!
+
+- afbjorklund (98 comments)
+- spowelljr (34 comments)
+- medyagh (10 comments)
+- kant777 (6 comments)
+- kundan2707 (6 comments)
+
+Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.29.0/) for this release!
+
 ## Version 1.28.0 - 2022-11-04
 
 **SECURITY WARNING:** Log4j CVEs were detected in an image the `efk` addon uses, if you don't use the `efk` addon no action is required. If you use the addon we recommend running `minikube addons disable efk` to terminate the vulnerable pods.
diff --git a/Makefile b/Makefile
index 8df41133ae..9c9c9eaa19 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
-VERSION_MINOR ?= 28
+VERSION_MINOR ?= 29
 VERSION_BUILD ?= 0
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)

From 2b7bf372b87525c52b622c424d0e4f0d87ec3fd8 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 26 Jan 2023 14:54:40 -0800
Subject: [PATCH 2/3] allow overriding minikube version

---
 CHANGELOG.md | 14 ++++++++------
 Makefile     |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b514899f8..257c18115d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,18 +3,20 @@
 ## Version 1.29.0 - 2023-01-26
 
 Features:
-* Graduate QEMU driver from experimental to GA [#15556](https://github.com/kubernetes/minikube/pull/15556)
-* Implement --static-ip flag (Docker only) [#15553](https://github.com/kubernetes/minikube/pull/15553)
-* Implement Kicbase/ISO version validation when starting existing clusters [#15235](https://github.com/kubernetes/minikube/pull/15235)
-* GCP-Auth addon automatically integrates with newly created namespaces [#15403](https://github.com/kubernetes/minikube/pull/15403)
+* Bump QEMU driver priority from experimental to default [#15556](https://github.com/kubernetes/minikube/pull/15556)
+* Ability to set static-ip for Docker driver [#15553](https://github.com/kubernetes/minikube/pull/15553)
+* GCP-Auth Addon: automatically attach credentials to newly created namespaces [#15403](https://github.com/kubernetes/minikube/pull/15403)
+* Allow forcing 1 CPU on Linux with docker and none driver [#15611](https://github.com/kubernetes/minikube/pull/15611) [#15610](https://github.com/kubernetes/minikube/pull/15610)
+
+Major Improvements:
 * Large improvements to cgroup detection and CNI and CRI configurations [#15463](https://github.com/kubernetes/minikube/pull/15463)
+* Prevent redownloading kicbase when already downloaded [#15528](https://github.com/kubernetes/minikube/pull/15528)
+* Warn when using an old ISO/Kicbase image [#15235](https://github.com/kubernetes/minikube/pull/15235)
 
 Minor Improvements:
-* Prevent redownloading kicbase when already downloaded [#15528](https://github.com/kubernetes/minikube/pull/15528)
 * Check brew install paths for socket_vmnet [#15701](https://github.com/kubernetes/minikube/pull/15701)
 * Include gcp-auth logs in 'minikube logs' output [#15666](https://github.com/kubernetes/minikube/pull/15666)
 * Use absolute path when calling crictl version [#15642](https://github.com/kubernetes/minikube/pull/15642)
-* Allow forcing 1 CPU on Linux with docker and none driver [#15611](https://github.com/kubernetes/minikube/pull/15611) [#15610](https://github.com/kubernetes/minikube/pull/15610)
 * Add additional memory overhead for VirtualBox when `--memory=max` [#15317](https://github.com/kubernetes/minikube/pull/15317)
 * Update Windows installer to create system-wide shortcut [#15405](https://github.com/kubernetes/minikube/pull/15405)
 * Add `--subnet` validation [#15530](https://github.com/kubernetes/minikube/pull/15530)
diff --git a/Makefile b/Makefile
index 9c9c9eaa19..2bdc684870 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 29
 VERSION_BUILD ?= 0
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
+VERSION ?= $(MINIKUBE_VERSION)
 VERSION ?= v$(RAW_VERSION)
 
 KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/constants/constants.go | cut -d \" -f2)

From 24976cf6f9f23a6b0900e012a910427346f8ec63 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 26 Jan 2023 15:25:58 -0800
Subject: [PATCH 3/3] rebuild iso and kicbase on release

---
 hack/jenkins/build_iso.sh          | 29 +++++++----------------
 hack/jenkins/kicbase_auto_build.sh | 38 +++++++++---------------------
 2 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/hack/jenkins/build_iso.sh b/hack/jenkins/build_iso.sh
index 9ab6ee9cdb..c5e554d315 100755
--- a/hack/jenkins/build_iso.sh
+++ b/hack/jenkins/build_iso.sh
@@ -47,27 +47,16 @@ else
 	export ISO_BUCKET
 fi
 
-if [ "$release" = false ]; then
-	# Build a new ISO for the PR
-	make release-iso | tee iso-logs.txt
-	# Abort with error message if above command failed
-	ec=$?
-	if [ $ec -gt 0 ]; then
-		if [ "$release" = false ]; then
-			gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new ISO failed.  
-			See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/iso_build.txt
-			"
-		fi
-		exit $ec
+make release-iso | tee iso-logs.txt
+# Abort with error message if above command failed
+ec=$?
+if [ $ec -gt 0 ]; then
+	if [ "$release" = false ]; then
+		gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new ISO failed.
+		See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/iso_build.txt
+		"
 	fi
-else
-	# Copy the most recently built PR ISO for release
-	CURRENT_ISO_VERSION=$(egrep "ISO_VERSION \?=" Makefile | cut -d " " -f 3)
-	CURRENT_ISO_BUCKET=$(egrep "isoBucket :=" pkg/minikube/download/iso.go | cut -d " " -f 3 | cut -d '"' -f 2)
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-amd64.iso gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-amd64.iso
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-amd64.iso.sha256 gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-amd64.iso.sha256
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-arm64.iso gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-arm64.iso
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-arm64.iso.sha256 gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-arm64.iso.sha256
+	exit $ec
 fi
 
 git config user.name "minikube-bot"
diff --git a/hack/jenkins/kicbase_auto_build.sh b/hack/jenkins/kicbase_auto_build.sh
index 9d155a0949..73619c8b24 100755
--- a/hack/jenkins/kicbase_auto_build.sh
+++ b/hack/jenkins/kicbase_auto_build.sh
@@ -37,8 +37,7 @@ curl -L https://github.com/kubernetes/minikube/raw/master/pkg/drivers/kic/types.
 # kicbase tags are of the form VERSION-TIMESTAMP-PR, so this grep finds that TIMESTAMP in the middle
 # if it doesn't exist, it will just return VERSION, which is covered in the if statement below
 HEAD_KIC_TIMESTAMP=$(egrep "Version =" types-head.go | cut -d \" -f 2 | cut -d "-" -f 2)
-CURRENT_KIC_VERSION=$(egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f 2)
-CURRENT_KIC_TS=$(echo $CURRENT_KIC_VERSION | cut -d "-" -f 2)
+CURRENT_KIC_TS=$(egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f 2 | cut -d "-" -f 2)
 if [[ $HEAD_KIC_TIMESTAMP != v* ]]; then
 	diff=$((CURRENT_KIC_TS-HEAD_KIC_TIMESTAMP))
 	if [[ $CURRENT_KIC_TS == v* ]] || [ $diff -lt 0 ]; then
@@ -68,33 +67,18 @@ GCR_IMG=${GCR_REPO}:${KIC_VERSION}
 DH_IMG=${DH_REPO}:${KIC_VERSION}
 export KICBASE_IMAGE_REGISTRIES="${GCR_IMG} ${DH_IMG}"
 
-if [ "$release" = false ]; then
-	# Build a new kicbase image
-	CIBUILD=yes make push-kic-base-image | tee kic-logs.txt
+# Build a new kicbase image
+CIBUILD=yes make push-kic-base-image | tee kic-logs.txt
 
-	# Abort with error message if above command failed
-	ec=$?
-	if [ $ec -gt 0 ]; then
-		if [ "$release" = false ]; then
-			gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new kicbase image failed.  
-			See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/kic_image_build.txt
-			"
-		fi
-		exit $ec
+# Abort with error message if above command failed
+ec=$?
+if [ $ec -gt 0 ]; then
+	if [ "$release" = false ]; then
+		gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new kicbase image failed.
+		See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/kic_image_build.txt
+		"
 	fi
-else
-	# Install crane, it does exactly what we want it to do
-	go install github.com/google/go-containerregistry/cmd/crane@latest
-
-	CURRENT_GCR_REPO=$(grep "gcrRepo =" pkg/drivers/kic/types.go | cut -d \" -f 2)
-	CURRENT_DH_REPO=$(grep "dockerhubRepo =" pkg/drivers/kic/types.go | cut -d \" -f 2)
-
-	CURRENT_GCR_IMG=$CURRENT_GCR_REPO:$CURRENT_KIC_VERSION
-	CURRENT_DH_IMG=$CURRENT_DH_REPO:$CURRENT_KIC_VERSION
-
-	crane copy $CURRENT_GCR_IMG $GCR_IMG
-	crane copy $CURRENT_DH_IMG $DH_IMG
-
+	exit $ec
 fi
 
 # Retrieve the sha from the new image