Merge pull request #9151 from tstromberg/storage-provisioner-tag3

Bump storage-provisioner version to v3
kubernetes · Sep 2, 2020 · d101042 · d101042
2 parents b1fc326 + 72e786f
commit d101042
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -92,7 +92,7 @@ SHA512SUM=$(shell command -v sha512sum || echo "shasum -a 512")
 GVISOR_TAG ?= latest
 
 # storage provisioner tag to push changes to
-STORAGE_PROVISIONER_TAG ?= v2
+STORAGE_PROVISIONER_TAG ?= v3
 
 # TODO: multi-arch manifest
 ifeq ($(GOARCH),amd64)

diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go
@@ -24,7 +24,7 @@ import (
 
 func TestAuxiliary(t *testing.T) {
 	want := []string{
-		"gcr.io/k8s-minikube/storage-provisioner:v2",
+		"gcr.io/k8s-minikube/storage-provisioner:v3",
 		"kubernetesui/dashboard:v2.0.3",
 		"kubernetesui/metrics-scraper:v1.0.4",
 	}
@@ -36,7 +36,7 @@ func TestAuxiliary(t *testing.T) {
 
 func TestAuxiliaryMirror(t *testing.T) {
 	want := []string{
-		"test.mirror/storage-provisioner:v2",
+		"test.mirror/storage-provisioner:v3",
 		"test.mirror/dashboard:v2.0.3",
 		"test.mirror/metrics-scraper:v1.0.4",
 	}

diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go
@@ -37,7 +37,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/coredns:1.6.5",
 			"k8s.gcr.io/etcd:3.4.3-0",
 			"k8s.gcr.io/pause:3.1",
-			"gcr.io/k8s-minikube/storage-provisioner:v2",
+			"gcr.io/k8s-minikube/storage-provisioner:v3",
 			"kubernetesui/dashboard:v2.0.3",
 			"kubernetesui/metrics-scraper:v1.0.4",
 		}},
@@ -49,7 +49,7 @@ func TestKubeadmImages(t *testing.T) {
 			"mirror.k8s.io/coredns:1.6.2",
 			"mirror.k8s.io/etcd:3.3.15-0",
 			"mirror.k8s.io/pause:3.1",
-			"mirror.k8s.io/storage-provisioner:v2",
+			"mirror.k8s.io/storage-provisioner:v3",
 			"mirror.k8s.io/dashboard:v2.0.3",
 			"mirror.k8s.io/metrics-scraper:v1.0.4",
 		}},
@@ -61,7 +61,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/coredns:1.3.1",
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
-			"gcr.io/k8s-minikube/storage-provisioner:v2",
+			"gcr.io/k8s-minikube/storage-provisioner:v3",
 			"kubernetesui/dashboard:v2.0.3",
 			"kubernetesui/metrics-scraper:v1.0.4",
 		}},
@@ -73,7 +73,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/coredns:1.3.1",
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
-			"gcr.io/k8s-minikube/storage-provisioner:v2",
+			"gcr.io/k8s-minikube/storage-provisioner:v3",
 			"kubernetesui/dashboard:v2.0.3",
 			"kubernetesui/metrics-scraper:v1.0.4",
 		}},
@@ -85,7 +85,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/coredns:1.2.6",
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
-			"gcr.io/k8s-minikube/storage-provisioner:v2",
+			"gcr.io/k8s-minikube/storage-provisioner:v3",
 			"kubernetesui/dashboard:v2.0.3",
 			"kubernetesui/metrics-scraper:v1.0.4",
 		}},
@@ -97,7 +97,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/coredns:1.2.2",
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
-			"gcr.io/k8s-minikube/storage-provisioner:v2",
+			"gcr.io/k8s-minikube/storage-provisioner:v3",
 			"kubernetesui/dashboard:v2.0.3",
 			"kubernetesui/metrics-scraper:v1.0.4",
 		}},

diff --git a/pkg/minikube/cruntime/containerd_test.go b/pkg/minikube/cruntime/containerd_test.go
@@ -27,7 +27,7 @@ func TestAddRepoTagToImageName(t *testing.T) {
 	}{
 		{"kubernetesui/dashboard:v2.0.3", "docker.io/kubernetesui/dashboard:v2.0.3"},
 		{"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"},
-		{"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2"},
+		{"gcr.io/k8s-minikube/storage-provisioner:v3", "gcr.io/k8s-minikube/storage-provisioner:v3"},
 	}
 	for _, tc := range tests {
 		t.Run(tc.imgName, func(t *testing.T) {