From e2c02ed6d06d706fbe06eddc06fb2ea5cc10ebc7 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 29 Mar 2021 12:52:35 -0700
Subject: [PATCH] bump storage provisioner image

---
 Makefile                         | 9 +++------
 pkg/minikube/download/preload.go | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fabb31a68e..9df07c5f6b 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,8 @@ GVISOR_TAG ?= latest
 AUTOPAUSE_HOOK_TAG ?= 1.13
 
 # storage provisioner tag to push changes to
-STORAGE_PROVISIONER_TAG ?= v4
+# NOTE: you will need to bump the PreloadVersion if you change this
+STORAGE_PROVISIONER_TAG ?= v5
 
 STORAGE_PROVISIONER_MANIFEST ?= $(REGISTRY)/storage-provisioner:$(STORAGE_PROVISIONER_TAG)
 STORAGE_PROVISIONER_IMAGE ?= $(REGISTRY)/storage-provisioner-$(GOARCH):$(STORAGE_PROVISIONER_TAG)
@@ -687,17 +688,13 @@ upload-preloaded-images-tar: out/minikube # Upload the preloaded images for olde
 	go build -ldflags="$(MINIKUBE_LDFLAGS)" -o out/upload-preload ./hack/preload-images/*.go
 	./out/upload-preload
 
-.PHONY: push-storage-provisioner-image
-push-storage-provisioner-image: storage-provisioner-image ## Push storage-provisioner docker image using gcloud
-	docker login gcr.io/k8s-minikube
-	$(MAKE) push-docker IMAGE=$(STORAGE_PROVISIONER_IMAGE)
 
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 IMAGE = $(REGISTRY)/storage-provisioner
 TAG = $(STORAGE_PROVISIONER_TAG)
 
 .PHONY: push-storage-provisioner-manifest
-push-storage-provisioner-manifest: $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~storage\-provisioner\-image\-&~g")
+push-storage-provisioner-manifest: $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~storage\-provisioner\-image\-&~g") ## Push multi-arch storage-provisioner image
 	docker login gcr.io/k8s-minikube
 	set -x; for arch in $(ALL_ARCH); do docker push ${IMAGE}-$${arch}:${TAG}; done
 	docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index de3d069ae8..bbbf24ed08 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -41,7 +41,7 @@ const (
 	// PreloadVersion is the current version of the preloaded tarball
 	//
 	// NOTE: You may need to bump this version up when upgrading auxiliary docker images
-	PreloadVersion = "v9"
+	PreloadVersion = "v10"
 	// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )