From 6408c29f0a16e1fa92cf6071ab27c83f643c0c02 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Thu, 21 Jan 2021 11:26:27 -0800
Subject: [PATCH 01/33] Add darwin-arm64 Makefile targets

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6941b2ccce..9f15e3add5 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,8 @@ out/minikube-linux-aarch64: out/minikube-linux-arm64
 .PHONY: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe
 minikube-linux-amd64: out/minikube-linux-amd64 ## Build Minikube for Linux 64bit
 minikube-linux-arm64: out/minikube-linux-arm64 ## Build Minikube for ARM 64bit
-minikube-darwin-amd64: out/minikube-darwin-amd64 ## Build Minikube for Darwin 64bit
+minikube-darwin-amd64: out/minikube-darwin-amd64 ## Build Minikube for Darwin x86 64bit
+minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin arm 64bit
 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit
 
 out/minikube-%: $(SOURCE_GENERATED) $(SOURCE_FILES)
@@ -219,7 +220,8 @@ endif
 .PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe
 e2e-linux-amd64: out/e2e-linux-amd64 ## Execute end-to-end testing for Linux 64bit
 e2e-linux-arm64: out/e2e-linux-arm64 ## Execute end-to-end testing for Linux ARM 64bit
-e2e-darwin-amd64: out/e2e-darwin-amd64 ## Execute end-to-end testing for Darwin 64bit
+e2e-darwin-amd64: out/e2e-darwin-amd64 ## Execute end-to-end testing for Darwin x86 64bit
+e2e-darwin-arm64: out/e2e-darwin-arm64 ## Execute end-to-end testing for Darwin arm 64bit
 e2e-windows-amd64.exe: out/e2e-windows-amd64.exe ## Execute end-to-end testing for Windows 64bit
 
 out/e2e-%: out/minikube-%
@@ -378,7 +380,7 @@ darwin: minikube-darwin-amd64 ## Build minikube for Darwin 64bit
 linux: minikube-linux-amd64 ## Build minikube for Linux 64bit
 
 .PHONY: e2e-cross
-e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe ## End-to-end cross test
+e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe ## End-to-end cross test
 
 .PHONY: checksum
 checksum: ## Generate checksums

From 855d55e4db2d8fdad36f982d36cb7b499260f944 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Thu, 21 Jan 2021 11:58:49 -0800
Subject: [PATCH 02/33] Add Makefile target for building fat darwin binary
 (both amd64+arm64)

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9f15e3add5..35e8900b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -201,13 +201,21 @@ out/minikube-linux-aarch64: out/minikube-linux-arm64
 	$(if $(quiet),@echo "  CP       $@")
 	$(Q)cp $< $@
 
-.PHONY: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe
+.PHONY: minikube-linux-amd64 minikube-linux-arm64
 minikube-linux-amd64: out/minikube-linux-amd64 ## Build Minikube for Linux 64bit
-minikube-linux-arm64: out/minikube-linux-arm64 ## Build Minikube for ARM 64bit
+minikube-linux-arm64: out/minikube-linux-arm64 ## Build Minikube for arm 64bit
+
+.PHONY: minikube-darwin minikube-darwin-amd64 minikube-darwin-arm64
 minikube-darwin-amd64: out/minikube-darwin-amd64 ## Build Minikube for Darwin x86 64bit
 minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin arm 64bit
+minikube-darwin: out/minikube-darwin ## Build Minikube fat binary for Darwin (both arm and x86 64bit)
+
+.PHONY: minikube-windows-amd64.exe
 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit
 
+out/minikube-darwin: out/minikube-darwin-amd64 out/minikube-darwin-arm64
+	lipo -create $^ -output $@
+
 out/minikube-%: $(SOURCE_GENERATED) $(SOURCE_FILES)
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)

From 606335a8834fcebc2c828a8cb75dfaa2ae75a307 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Thu, 21 Jan 2021 23:04:52 -0800
Subject: [PATCH 03/33] Fix Makefile comments for e2e targets

---
 Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 35e8900b5d..cc2c1527ce 100644
--- a/Makefile
+++ b/Makefile
@@ -207,8 +207,8 @@ minikube-linux-arm64: out/minikube-linux-arm64 ## Build Minikube for arm 64bit
 
 .PHONY: minikube-darwin minikube-darwin-amd64 minikube-darwin-arm64
 minikube-darwin-amd64: out/minikube-darwin-amd64 ## Build Minikube for Darwin x86 64bit
-minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin arm 64bit
-minikube-darwin: out/minikube-darwin ## Build Minikube fat binary for Darwin (both arm and x86 64bit)
+minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin ARM 64bit
+minikube-darwin: out/minikube-darwin ## Build Minikube fat binary for Darwin (both ARM and x86 64bit)
 
 .PHONY: minikube-windows-amd64.exe
 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit
@@ -226,11 +226,11 @@ else
 endif
 
 .PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe
-e2e-linux-amd64: out/e2e-linux-amd64 ## Execute end-to-end testing for Linux 64bit
-e2e-linux-arm64: out/e2e-linux-arm64 ## Execute end-to-end testing for Linux ARM 64bit
-e2e-darwin-amd64: out/e2e-darwin-amd64 ## Execute end-to-end testing for Darwin x86 64bit
-e2e-darwin-arm64: out/e2e-darwin-arm64 ## Execute end-to-end testing for Darwin arm 64bit
-e2e-windows-amd64.exe: out/e2e-windows-amd64.exe ## Execute end-to-end testing for Windows 64bit
+e2e-linux-amd64: out/e2e-linux-amd64 ## build end2end binary for Linux 64bit
+e2e-linux-arm64: out/e2e-linux-arm64 ## build end2end binary for Linux ARM 64bit
+e2e-darwin-amd64: out/e2e-darwin-amd64 ## build end2end binary for Darwin x86 64bit
+e2e-darwin-arm64: out/e2e-darwin-arm64 ## build end2end binary for Darwin ARM 64bit
+e2e-windows-amd64.exe: out/e2e-windows-amd64.exe ## build end2end binary for Windows 64bit
 
 out/e2e-%: out/minikube-%
 	GOOS="$(firstword $(subst -, ,$*))" GOARCH="$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*)))" go test -ldflags="${MINIKUBE_LDFLAGS}" -c k8s.io/minikube/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS)" -o $@

From 5e371df1b159f31a4ea650673650729c3464152c Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Thu, 21 Jan 2021 23:06:22 -0800
Subject: [PATCH 04/33] Fix Makefile comments for e2e targets

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cc2c1527ce..9907f0bdf7 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ else
 endif
 
 .PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe
-e2e-linux-amd64: out/e2e-linux-amd64 ## build end2end binary for Linux 64bit
+e2e-linux-amd64: out/e2e-linux-amd64 ## build end2end binary for Linux x86 64bit
 e2e-linux-arm64: out/e2e-linux-arm64 ## build end2end binary for Linux ARM 64bit
 e2e-darwin-amd64: out/e2e-darwin-amd64 ## build end2end binary for Darwin x86 64bit
 e2e-darwin-arm64: out/e2e-darwin-arm64 ## build end2end binary for Darwin ARM 64bit

From b4d1e207a53469f6f1a9ac3339aac049ee7a7844 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Thu, 21 Jan 2021 14:02:01 +0100
Subject: [PATCH 05/33] install losetup from util-linux in the ISO

The losetup tool is used by Kubernetes to setup BlockMode volumes.
BusyBox provides a version, but it does not have the `-j` option.
---
 deploy/iso/minikube-iso/configs/minikube_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig
index 0008346e16..6ee070ac7a 100644
--- a/deploy/iso/minikube-iso/configs/minikube_defconfig
+++ b/deploy/iso/minikube-iso/configs/minikube_defconfig
@@ -58,6 +58,7 @@ BR2_PACKAGE_OPENVMTOOLS=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_SYSTEMD_MACHINED=y
 BR2_PACKAGE_SYSTEMD_VCONSOLE=y
+BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
 BR2_PACKAGE_UTIL_LINUX_NSENTER=y
 BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
 BR2_TARGET_ROOTFS_CPIO=y

From 2f18e5a492f48b1d25c50649c2251ba684091424 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Mon, 25 Jan 2021 10:40:58 -0800
Subject: [PATCH 06/33] remove target for universal darwin binary

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9907f0bdf7..e5f08a23b5 100644
--- a/Makefile
+++ b/Makefile
@@ -213,9 +213,6 @@ minikube-darwin: out/minikube-darwin ## Build Minikube fat binary for Darwin (bo
 .PHONY: minikube-windows-amd64.exe
 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit
 
-out/minikube-darwin: out/minikube-darwin-amd64 out/minikube-darwin-arm64
-	lipo -create $^ -output $@
-
 out/minikube-%: $(SOURCE_GENERATED) $(SOURCE_FILES)
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)

From 7cc2874a53a17a097859b60e78aee7a673981d48 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Mon, 25 Jan 2021 10:48:44 -0800
Subject: [PATCH 07/33] Fix build

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e5f08a23b5..b9a68fdbc3 100644
--- a/Makefile
+++ b/Makefile
@@ -385,7 +385,7 @@ darwin: minikube-darwin-amd64 ## Build minikube for Darwin 64bit
 linux: minikube-linux-amd64 ## Build minikube for Linux 64bit
 
 .PHONY: e2e-cross
-e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe ## End-to-end cross test
+e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe ## End-to-end cross test
 
 .PHONY: checksum
 checksum: ## Generate checksums

From 344e2fd87d6da31f93c590b23970c632d234e622 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Mon, 25 Jan 2021 10:56:36 -0800
Subject: [PATCH 08/33] remove unused .phony targets

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b9a68fdbc3..157687e51f 100644
--- a/Makefile
+++ b/Makefile
@@ -205,10 +205,9 @@ out/minikube-linux-aarch64: out/minikube-linux-arm64
 minikube-linux-amd64: out/minikube-linux-amd64 ## Build Minikube for Linux 64bit
 minikube-linux-arm64: out/minikube-linux-arm64 ## Build Minikube for arm 64bit
 
-.PHONY: minikube-darwin minikube-darwin-amd64 minikube-darwin-arm64
+.PHONY: minikube-darwin-amd64 minikube-darwin-arm64
 minikube-darwin-amd64: out/minikube-darwin-amd64 ## Build Minikube for Darwin x86 64bit
 minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin ARM 64bit
-minikube-darwin: out/minikube-darwin ## Build Minikube fat binary for Darwin (both ARM and x86 64bit)
 
 .PHONY: minikube-windows-amd64.exe
 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit

From eaf4f96304794406ef016cde9b11215ceece8922 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 13:07:13 -0800
Subject: [PATCH 09/33] update jenkins build scripts

---
 hack/jenkins/release_build_and_upload-test.sh | 78 +++++++++++++++++++
 hack/jenkins/release_build_and_upload.sh      |  3 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100755 hack/jenkins/release_build_and_upload-test.sh

diff --git a/hack/jenkins/release_build_and_upload-test.sh b/hack/jenkins/release_build_and_upload-test.sh
new file mode 100755
index 0000000000..7e625d3f54
--- /dev/null
+++ b/hack/jenkins/release_build_and_upload-test.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script builds all the minikube binary for all 3 platforms as well as Windows-installer and .deb
+# This is intended to be run on a new release tag in order to build/upload the required files for a release
+
+# The script expects the following env variables:
+# VERSION_MAJOR: The major version of the tag to be released.
+# VERSION_MINOR: The minor version of the tag to be released.
+# VERSION_BUILD: The build version of the tag to be released.
+# BUCKET: The GCP bucket the build files should be uploaded to.
+# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
+
+set -eux -o pipefail
+readonly VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
+readonly DEB_VERSION="${VERSION/-/\~}"
+readonly RPM_VERSION="${DEB_VERSION}"
+readonly TAGNAME="v${VERSION}"
+
+# Make sure the tag matches the Makefile
+grep -E "^VERSION_MAJOR \\?=" Makefile | grep "${VERSION_MAJOR}"
+grep -E "^VERSION_MINOR \\?=" Makefile | grep "${VERSION_MINOR}"
+grep -E "^VERSION_BUILD \\?=" Makefile | grep "${VERSION_BUILD}"
+
+# Force go packages to the Jekins home directory
+export GOPATH=$HOME/go
+
+# Verify ISO exists
+echo "Verifying ISO exists ..."
+make verify-iso
+
+# Build and upload
+env BUILD_IN_DOCKER=y BUILD_IMAGE=golang:1.16beta1-buster \
+  make -j 16 \
+  all \
+  out/minikube-darwin-arm64 \
+  out/minikube-installer.exe \
+  "out/minikube_${DEB_VERSION}-0_amd64.deb" \
+  "out/minikube_${DEB_VERSION}-0_arm64.deb" \
+  "out/minikube-${RPM_VERSION}-0.x86_64.rpm" \
+  "out/minikube-${RPM_VERSION}-0.aarch64.rpm" \
+  "out/docker-machine-driver-kvm2_${DEB_VERSION}-0_amd64.deb" \
+  "out/docker-machine-driver-kvm2-${RPM_VERSION}-0.x86_64.rpm"
+
+make checksum
+
+# unversioned names to avoid updating upstream Kubernetes documentation each release
+cp "out/minikube_${DEB_VERSION}-0_amd64.deb" out/minikube_latest_amd64.deb
+cp "out/minikube_${DEB_VERSION}-0_arm64.deb" out/minikube_latest_arm64.deb
+cp "out/minikube-${RPM_VERSION}-0.x86_64.rpm" out/minikube-latest.x86_64.rpm
+cp "out/minikube-${RPM_VERSION}-0.aarch64.rpm" out/minikube-latest.aarch64.rpm
+
+gsutil -m cp out/* "gs://$BUCKET/releases/$TAGNAME/"
+
+# Update "latest" release for non-beta/non-alpha builds
+if ! [[ ${VERSION_BUILD} =~ ^[0-9]+$ ]]; then
+  echo "NOTE: ${VERSION} appears to be a non-standard release, not updating /releases/latest"
+  exit 0
+fi
+
+#echo "Updating Docker images ..."
+#make push-gvisor-addon-image push-storage-provisioner-manifest
+
+echo "Updating latest bucket for ${VERSION} release ..."
+gsutil cp -r "gs://${BUCKET}/releases/${TAGNAME}/*" "gs://${BUCKET}/releases/latest/"
diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh
index c2f15d9645..7e625d3f54 100755
--- a/hack/jenkins/release_build_and_upload.sh
+++ b/hack/jenkins/release_build_and_upload.sh
@@ -43,9 +43,10 @@ echo "Verifying ISO exists ..."
 make verify-iso
 
 # Build and upload
-env BUILD_IN_DOCKER=y \
+env BUILD_IN_DOCKER=y BUILD_IMAGE=golang:1.16beta1-buster \
   make -j 16 \
   all \
+  out/minikube-darwin-arm64 \
   out/minikube-installer.exe \
   "out/minikube_${DEB_VERSION}-0_amd64.deb" \
   "out/minikube_${DEB_VERSION}-0_arm64.deb" \

From ef348327434179290802326b4acde5838ab3c23f Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 13:08:14 -0800
Subject: [PATCH 10/33] update jenkins build scripts

---
 hack/jenkins/release_build_and_upload-test.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hack/jenkins/release_build_and_upload-test.sh b/hack/jenkins/release_build_and_upload-test.sh
index 7e625d3f54..c59890f968 100755
--- a/hack/jenkins/release_build_and_upload-test.sh
+++ b/hack/jenkins/release_build_and_upload-test.sh
@@ -63,7 +63,6 @@ cp "out/minikube_${DEB_VERSION}-0_arm64.deb" out/minikube_latest_arm64.deb
 cp "out/minikube-${RPM_VERSION}-0.x86_64.rpm" out/minikube-latest.x86_64.rpm
 cp "out/minikube-${RPM_VERSION}-0.aarch64.rpm" out/minikube-latest.aarch64.rpm
 
-gsutil -m cp out/* "gs://$BUCKET/releases/$TAGNAME/"
 
 # Update "latest" release for non-beta/non-alpha builds
 if ! [[ ${VERSION_BUILD} =~ ^[0-9]+$ ]]; then
@@ -75,4 +74,3 @@ fi
 #make push-gvisor-addon-image push-storage-provisioner-manifest
 
 echo "Updating latest bucket for ${VERSION} release ..."
-gsutil cp -r "gs://${BUCKET}/releases/${TAGNAME}/*" "gs://${BUCKET}/releases/latest/"

From 6b29e263fed3fceb5264c397997745670119bd7b Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 14:16:34 -0800
Subject: [PATCH 11/33] Use test build_image

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 157687e51f..260140dab3 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,13 @@ COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true)
 HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
-BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
+
+# TODO
+#BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
+BUILD_IMAGE 	?= golang:1.16beta1-buster
+#
+
+
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)
 

From 39c7c7c345a3434df8327a3fedff7bf7229d8710 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 14:27:39 -0800
Subject: [PATCH 12/33] add test build image

---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 157687e51f..a5f4eb8449 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,14 @@ COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true)
 HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
-BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
+
+#
+# TODO
+#BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
+BUILD_IMAGE 	?= golang:1.16beta1-buster
+#
+#
+
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)
 

From 784f8d3919c3936d2811ac37b4834f9820fdaa23 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 14:34:39 -0800
Subject: [PATCH 13/33] Add more comments to TODO related to BUILD_IMAGE

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a5f4eb8449..1f52ae5a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
 
 #
-# TODO
+# TODO: See https://github.com/kubernetes/minikube/issues/10276
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
 BUILD_IMAGE 	?= golang:1.16beta1-buster
 #

From 7850e18a16572bb51103fc7bbfbe24ccd1baed97 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 14:57:06 -0800
Subject: [PATCH 14/33] Remove test script

---
 hack/jenkins/release_build_and_upload-test.sh | 76 -------------------
 1 file changed, 76 deletions(-)
 delete mode 100755 hack/jenkins/release_build_and_upload-test.sh

diff --git a/hack/jenkins/release_build_and_upload-test.sh b/hack/jenkins/release_build_and_upload-test.sh
deleted file mode 100755
index c59890f968..0000000000
--- a/hack/jenkins/release_build_and_upload-test.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script builds all the minikube binary for all 3 platforms as well as Windows-installer and .deb
-# This is intended to be run on a new release tag in order to build/upload the required files for a release
-
-# The script expects the following env variables:
-# VERSION_MAJOR: The major version of the tag to be released.
-# VERSION_MINOR: The minor version of the tag to be released.
-# VERSION_BUILD: The build version of the tag to be released.
-# BUCKET: The GCP bucket the build files should be uploaded to.
-# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
-
-set -eux -o pipefail
-readonly VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
-readonly DEB_VERSION="${VERSION/-/\~}"
-readonly RPM_VERSION="${DEB_VERSION}"
-readonly TAGNAME="v${VERSION}"
-
-# Make sure the tag matches the Makefile
-grep -E "^VERSION_MAJOR \\?=" Makefile | grep "${VERSION_MAJOR}"
-grep -E "^VERSION_MINOR \\?=" Makefile | grep "${VERSION_MINOR}"
-grep -E "^VERSION_BUILD \\?=" Makefile | grep "${VERSION_BUILD}"
-
-# Force go packages to the Jekins home directory
-export GOPATH=$HOME/go
-
-# Verify ISO exists
-echo "Verifying ISO exists ..."
-make verify-iso
-
-# Build and upload
-env BUILD_IN_DOCKER=y BUILD_IMAGE=golang:1.16beta1-buster \
-  make -j 16 \
-  all \
-  out/minikube-darwin-arm64 \
-  out/minikube-installer.exe \
-  "out/minikube_${DEB_VERSION}-0_amd64.deb" \
-  "out/minikube_${DEB_VERSION}-0_arm64.deb" \
-  "out/minikube-${RPM_VERSION}-0.x86_64.rpm" \
-  "out/minikube-${RPM_VERSION}-0.aarch64.rpm" \
-  "out/docker-machine-driver-kvm2_${DEB_VERSION}-0_amd64.deb" \
-  "out/docker-machine-driver-kvm2-${RPM_VERSION}-0.x86_64.rpm"
-
-make checksum
-
-# unversioned names to avoid updating upstream Kubernetes documentation each release
-cp "out/minikube_${DEB_VERSION}-0_amd64.deb" out/minikube_latest_amd64.deb
-cp "out/minikube_${DEB_VERSION}-0_arm64.deb" out/minikube_latest_arm64.deb
-cp "out/minikube-${RPM_VERSION}-0.x86_64.rpm" out/minikube-latest.x86_64.rpm
-cp "out/minikube-${RPM_VERSION}-0.aarch64.rpm" out/minikube-latest.aarch64.rpm
-
-
-# Update "latest" release for non-beta/non-alpha builds
-if ! [[ ${VERSION_BUILD} =~ ^[0-9]+$ ]]; then
-  echo "NOTE: ${VERSION} appears to be a non-standard release, not updating /releases/latest"
-  exit 0
-fi
-
-#echo "Updating Docker images ..."
-#make push-gvisor-addon-image push-storage-provisioner-manifest
-
-echo "Updating latest bucket for ${VERSION} release ..."

From 2b2dbfbb7901e81d9f5b1fb68dbbaac37af368b8 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 15:14:21 -0800
Subject: [PATCH 15/33] Trigger build

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1f52ae5a4d..941634ff58 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
 BUILD_IMAGE 	?= golang:1.16beta1-buster
 #
-#
 
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)

From 2f0d3d62cee1aaf7cb440116127f09fe0fee3d61 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 15:31:40 -0800
Subject: [PATCH 16/33] Add minikube-darwin-arm64 to build script

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 382adacea7..3795a5475d 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -39,7 +39,7 @@ declare -rx TAG="${ghprbActualCommit}"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
-make -j 16 all && failed=$? || failed=$?
+make -j 16 all minikube-darwin-arm64 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
 

From 686bb48812300a3650e3155373516980b5e68e6a Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 15:42:20 -0800
Subject: [PATCH 17/33] Build DEB and RPM packages in
 minikube_cross_build_and_upload.sh

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 3795a5475d..c714f3678f 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,10 +36,22 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
+declare -rx DEB_VERSION="${ghprbActualCommit}"
+declare -rx RPM_VERSION="${ghprbActualCommit}"
+
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
-make -j 16 all minikube-darwin-arm64 && failed=$? || failed=$?
+make -j 16 \
+  all \
+  minikube-darwin-arm64 \
+  "out/minikube_${DEB_VERSION}-0_amd64.deb" \
+  "out/minikube_${DEB_VERSION}-0_arm64.deb" \
+  "out/minikube-${RPM_VERSION}-0.x86_64.rpm" \
+  "out/minikube-${RPM_VERSION}-0.aarch64.rpm" \
+  "out/docker-machine-driver-kvm2_${DEB_VERSION}-0_amd64.deb" \
+  "out/docker-machine-driver-kvm2-${RPM_VERSION}-0.x86_64.rpm" \
+&& failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
 

From adaf96def5b84c195aa0e989d99d275726131435 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 16:49:59 -0800
Subject: [PATCH 18/33] Fix merge conflict

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3f4cb15568..941634ff58 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,6 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 
 #
 # TODO: See https://github.com/kubernetes/minikube/issues/10276
->>>>>>> refs/remotes/origin/ilyaz/add_darwin_arm64_binary
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
 BUILD_IMAGE 	?= golang:1.16beta1-buster
 #

From d01642bab80d3dc4282205728a0f7b5b5380ff24 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 17:11:06 -0800
Subject: [PATCH 19/33] use dev/rpm version from makefile

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index c714f3678f..4e4065cc2f 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,9 +36,8 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
-declare -rx DEB_VERSION="${ghprbActualCommit}"
-declare -rx RPM_VERSION="${ghprbActualCommit}"
-
+declare -rx DEB_VERSION="$(make deb_version)"
+declare -rx RPM_VERSION="$(make deb_version)"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true

From d6216098287e50f27b4fab5a4c449408a2f0f325 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 18:01:15 -0800
Subject: [PATCH 20/33] do not set BUILD_IMAGE in
 hack/jenkins/release_build_and_upload.sh

---
 hack/jenkins/release_build_and_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh
index 7e625d3f54..e743d8c0cd 100755
--- a/hack/jenkins/release_build_and_upload.sh
+++ b/hack/jenkins/release_build_and_upload.sh
@@ -43,7 +43,7 @@ echo "Verifying ISO exists ..."
 make verify-iso
 
 # Build and upload
-env BUILD_IN_DOCKER=y BUILD_IMAGE=golang:1.16beta1-buster \
+env BUILD_IN_DOCKER=y \
   make -j 16 \
   all \
   out/minikube-darwin-arm64 \

From 200946f5ab028794d234dcbbea3e1533ff62da6b Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 22:13:44 -0800
Subject: [PATCH 21/33] Trigger build

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 941634ff58..d135ae6a36 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
 
+
 #
 # TODO: See https://github.com/kubernetes/minikube/issues/10276
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1

From 5efe2ea7261f0f4fa7c0bb29669340b39fa1d65f Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 22:27:33 -0800
Subject: [PATCH 22/33] Trigger build

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index d135ae6a36..941634ff58 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
 
-
 #
 # TODO: See https://github.com/kubernetes/minikube/issues/10276
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1

From 9159474c4f18faed16d641408041ed0102999a15 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 22:34:13 -0800
Subject: [PATCH 23/33] Trigger build

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 941634ff58..d135ae6a36 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.12.x
 # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
 # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
 
+
 #
 # TODO: See https://github.com/kubernetes/minikube/issues/10276
 #BUILD_IMAGE 	?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1

From e12283ef854654321bf5977327678e7b682eff4f Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 22:43:16 -0800
Subject: [PATCH 24/33] Trigger build

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 4e4065cc2f..2f6c1f091c 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -44,7 +44,9 @@ docker rm $(docker ps -aq) || true
 make -j 16 \
   all \
   minikube-darwin-arm64 \
-  "out/minikube_${DEB_VERSION}-0_amd64.deb" \
+&& failed=$? || failed=$?
+
+make "out/minikube_${DEB_VERSION}-0_amd64.deb" \
   "out/minikube_${DEB_VERSION}-0_arm64.deb" \
   "out/minikube-${RPM_VERSION}-0.x86_64.rpm" \
   "out/minikube-${RPM_VERSION}-0.aarch64.rpm" \

From 58ee238e4f14b612a05e86a30039c92762404177 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 23:13:54 -0800
Subject: [PATCH 25/33] Fix RPM_VERSION

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 2f6c1f091c..294bff0fc0 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -37,7 +37,7 @@ declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
 declare -rx DEB_VERSION="$(make deb_version)"
-declare -rx RPM_VERSION="$(make deb_version)"
+declare -rx RPM_VERSION="${DEB_VERSION}"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true

From 01170c629e0616b2ae3c72f7f53b534754f72138 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 23:19:30 -0800
Subject: [PATCH 26/33] Add deb_version_base make target

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 755be29f3e..dcec6d7a57 100644
--- a/Makefile
+++ b/Makefile
@@ -481,6 +481,10 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
 deb_version:
 	@echo $(DEB_VERSION)-$(DEB_REVISION)
 
+.PHONY: deb_version_base
+deb_version_base:
+	@echo $(DEB_VERSION)
+
 out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
 	cp $< $@
 

From faa1706b55e47fe1d5885acf2c2500608a6a9ac8 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Tue, 26 Jan 2021 23:22:55 -0800
Subject: [PATCH 27/33] Add deb_version_base make target

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 294bff0fc0..b4216c44b3 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,7 +36,7 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
-declare -rx DEB_VERSION="$(make deb_version)"
+declare -rx DEB_VERSION="$(make deb_version_base)"
 declare -rx RPM_VERSION="${DEB_VERSION}"
 
 docker kill $(docker ps -q) || true

From ddb5cc02b7e178f61960c85ad10933a979e5085d Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 09:41:45 -0800
Subject: [PATCH 28/33] Fix deb_version in build script

---
 Makefile                                        |  4 ----
 hack/jenkins/minikube_cross_build_and_upload.sh | 13 +++++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index dcec6d7a57..755be29f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -481,10 +481,6 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
 deb_version:
 	@echo $(DEB_VERSION)-$(DEB_REVISION)
 
-.PHONY: deb_version_base
-deb_version_base:
-	@echo $(DEB_VERSION)
-
 out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
 	cp $< $@
 
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index b4216c44b3..b714fd811a 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,8 +36,8 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
-declare -rx DEB_VERSION="$(make deb_version_base)"
-declare -rx RPM_VERSION="${DEB_VERSION}"
+declare -rx DEB_VERSION="$(make deb_version)"
+declare -rx RPM_VERSION="$(make rpm_version)"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
@@ -46,12 +46,9 @@ make -j 16 \
   minikube-darwin-arm64 \
 && failed=$? || failed=$?
 
-make "out/minikube_${DEB_VERSION}-0_amd64.deb" \
-  "out/minikube_${DEB_VERSION}-0_arm64.deb" \
-  "out/minikube-${RPM_VERSION}-0.x86_64.rpm" \
-  "out/minikube-${RPM_VERSION}-0.aarch64.rpm" \
-  "out/docker-machine-driver-kvm2_${DEB_VERSION}-0_amd64.deb" \
-  "out/docker-machine-driver-kvm2-${RPM_VERSION}-0.x86_64.rpm" \
+make "out/minikube_${DEB_VERSION}_amd64.deb" \
+  "out/minikube_${DEB_VERSION}_arm64.deb" \
+  "out/docker-machine-driver-kvm2_${DEB_VERSION}_amd64.deb" \
 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version

From 8c5e64ce47cbf5169902390d3c2f34aabd34988c Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 10:02:04 -0800
Subject: [PATCH 29/33] add deb make target

---
 Makefile                                        | 4 ++++
 hack/jenkins/minikube_cross_build_and_upload.sh | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 755be29f3e..891774e1d0 100644
--- a/Makefile
+++ b/Makefile
@@ -481,6 +481,10 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
 deb_version:
 	@echo $(DEB_VERSION)-$(DEB_REVISION)
 
+.PHONY: deb
+deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb out/docker-machine-driver-kvm2_$(DEB_VERSION)-0_amd64.deb
+
+
 out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
 	cp $< $@
 
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index b714fd811a..01200a3caf 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -46,9 +46,7 @@ make -j 16 \
   minikube-darwin-arm64 \
 && failed=$? || failed=$?
 
-make "out/minikube_${DEB_VERSION}_amd64.deb" \
-  "out/minikube_${DEB_VERSION}_arm64.deb" \
-  "out/docker-machine-driver-kvm2_${DEB_VERSION}_amd64.deb" \
+make deb \
 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version

From 5050670631fb326b784192283a61a41702d8d5b5 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 11:04:55 -0800
Subject: [PATCH 30/33] fix deb_version issue

---
 hack/jenkins/minikube_cross_build_and_upload.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 01200a3caf..89b9cd8e82 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,17 +36,16 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
-declare -rx DEB_VERSION="$(make deb_version)"
-declare -rx RPM_VERSION="$(make rpm_version)"
+declare -rx DEB_VER="$(make deb_version)"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
 make -j 16 \
   all \
   minikube-darwin-arm64 \
-&& failed=$? || failed=$?
-
-make deb \
+  out/minikube_$(DEB_VER)_amd64.deb \
+  out/minikube_$(DEB_VER)_arm64.deb \
+  out/docker-machine-driver-kvm2_$(DEB_VER)-0_amd64.deb \
 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version

From 080cf3d83fb949332eeba427a2288f546dc7577a Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 11:18:25 -0800
Subject: [PATCH 31/33] fix deb_version issue

---
 Makefile                                        | 2 ++
 hack/jenkins/minikube_cross_build_and_upload.sh | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 891774e1d0..5f006607bf 100644
--- a/Makefile
+++ b/Makefile
@@ -489,6 +489,8 @@ out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd
 	cp $< $@
 
 out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_%.deb: out/minikube-linux-%
+	echo $@ 
+	exit
 	$(eval DEB_PACKAGING_DIRECTORY_$*=$(shell mktemp -d --suffix ".minikube_$(DEB_VERSION)-$*-deb"))
 	cp -r installers/linux/deb/minikube_deb_template/* $(DEB_PACKAGING_DIRECTORY_$*)/
 	chmod 0755 $(DEB_PACKAGING_DIRECTORY_$*)/DEBIAN
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 89b9cd8e82..5161024b5b 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -43,9 +43,9 @@ docker rm $(docker ps -aq) || true
 make -j 16 \
   all \
   minikube-darwin-arm64 \
-  out/minikube_$(DEB_VER)_amd64.deb \
-  out/minikube_$(DEB_VER)_arm64.deb \
-  out/docker-machine-driver-kvm2_$(DEB_VER)-0_amd64.deb \
+  out/minikube_${DEB_VER}_amd64.deb \
+  out/minikube_${DEB_VER}_arm64.deb \
+  out/docker-machine-driver-kvm2_${DEB_VER}-0_amd64.deb \
 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version

From 2320d7c34c4f5ea067ea5e99c4e9f10090bd51c0 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 11:33:45 -0800
Subject: [PATCH 32/33] fix deb_version issue

---
 Makefile                                        | 7 ++++---
 hack/jenkins/minikube_cross_build_and_upload.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5f006607bf..e9edd5fa14 100644
--- a/Makefile
+++ b/Makefile
@@ -478,12 +478,13 @@ verify-iso: # Make sure the current ISO exists in the expected bucket
 out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants") pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
 	go run -ldflags="$(MINIKUBE_LDFLAGS)" -tags gendocs hack/help_text/gen_help_text.go
 
+.PHONY: deb_version
 deb_version:
 	@echo $(DEB_VERSION)-$(DEB_REVISION)
 
-.PHONY: deb
-deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb out/docker-machine-driver-kvm2_$(DEB_VERSION)-0_amd64.deb
-
+.PHONY: deb_version_base
+deb_version_base:
+	@echo $(DEB_VERSION)
 
 out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
 	cp $< $@
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 5161024b5b..1404fd2d02 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -45,7 +45,7 @@ make -j 16 \
   minikube-darwin-arm64 \
   out/minikube_${DEB_VER}_amd64.deb \
   out/minikube_${DEB_VER}_arm64.deb \
-  out/docker-machine-driver-kvm2_${DEB_VER}-0_amd64.deb \
+  out/docker-machine-driver-kvm2_$(make deb_version_base).deb \
 && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version

From 6d8c2b9263561f56fe96c3cc18c0c8b77e95c817 Mon Sep 17 00:00:00 2001
From: Ilya Zuyev <izuyev@google.com>
Date: Wed, 27 Jan 2021 14:38:36 -0800
Subject: [PATCH 33/33] Remove debug code

---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index e9edd5fa14..a0650b1b10 100644
--- a/Makefile
+++ b/Makefile
@@ -490,8 +490,6 @@ out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd
 	cp $< $@
 
 out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_%.deb: out/minikube-linux-%
-	echo $@ 
-	exit
 	$(eval DEB_PACKAGING_DIRECTORY_$*=$(shell mktemp -d --suffix ".minikube_$(DEB_VERSION)-$*-deb"))
 	cp -r installers/linux/deb/minikube_deb_template/* $(DEB_PACKAGING_DIRECTORY_$*)/
 	chmod 0755 $(DEB_PACKAGING_DIRECTORY_$*)/DEBIAN