Skip to content

Commit c909561

Browse files
medyaghmedyagh
authored
Merge pull request #9822 from medyagh/storage_prov_v4
bump storage provsioner to multi arch
2 parents fe595ef + 8916ac4 commit c909561

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ SHA512SUM=$(shell command -v sha512sum || echo "shasum -a 512")
9292
GVISOR_TAG ?= latest
9393

9494
# storage provisioner tag to push changes to
95-
STORAGE_PROVISIONER_TAG ?= v3
95+
STORAGE_PROVISIONER_TAG ?= v4
9696

9797
STORAGE_PROVISIONER_MANIFEST ?= $(REGISTRY)/storage-provisioner:$(STORAGE_PROVISIONER_TAG)
9898
STORAGE_PROVISIONER_IMAGE ?= $(REGISTRY)/storage-provisioner-$(GOARCH):$(STORAGE_PROVISIONER_TAG)

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ require (
7575
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
7676
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f
7777
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
78-
go.opencensus.io v0.22.4
7978
go.opentelemetry.io/otel v0.13.0
8079
go.opentelemetry.io/otel/sdk v0.13.0
8180
golang.org/x/build v0.0.0-20190927031335-2835ba2e683f

‎go.sum

+5-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5H
9494
github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
9595
github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo=
9696
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
97-
github.com/GoogleCloudPlatform/opentelemetry-operations-go v0.13.0 h1:Gx9IxOjR9ug5Ad8YbafxJ6N2g6oDj/Q419tYHdd1od4=
9897
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.13.0 h1:fjKUtfldCPIF4nIzAAj3LzP8Lrd3DuRIMiFdOsj4fLc=
9998
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.13.0/go.mod h1:q/paYxLXKVhwfC3lzLfhtL54fAx14wzMN9DundQOBMc=
10099
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
@@ -558,6 +557,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg
558557
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
559558
github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE=
560559
github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
560+
github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs=
561561
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
562562
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
563563
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ=
@@ -588,6 +588,7 @@ github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV
588588
github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
589589
github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0=
590590
github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
591+
github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3 h1:eHv/jVY/JNop1xg2J9cBb4EzyMpWZoNCP1BslSAIkOI=
591592
github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3/go.mod h1:h/KNeRx7oYU4SpA4SoY7W2/NxDKEEVuwA6j9A27L4OI=
592593
github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg=
593594
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
@@ -1108,6 +1109,7 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
11081109
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
11091110
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
11101111
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
1112+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
11111113
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
11121114
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
11131115
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
@@ -1193,7 +1195,6 @@ go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
11931195
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
11941196
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
11951197
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1196-
go.opentelemetry.io v0.1.0 h1:EANZoRCOP+A3faIlw/iN6YEWoYb1vleZRKm1EvH8T48=
11971198
go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA=
11981199
go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY=
11991200
go.opentelemetry.io/otel/sdk v0.13.0 h1:4VCfpKamZ8GtnepXxMRurSpHpMKkcxhtO33z1S4rGDQ=
@@ -1506,6 +1507,7 @@ golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d h1:SR+e35rACZFBohNb4Om1ibX
15061507
golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
15071508
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
15081509
golang.org/x/tools v0.0.0-20200701151220-7cb253f4c4f8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
1510+
golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed h1:+qzWo37K31KxduIYaBeMqJ8MUOyTayOQKpH9aDPLMSY=
15091511
golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
15101512
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
15111513
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
@@ -1664,6 +1666,7 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
16641666
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
16651667
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
16661668
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1669+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
16671670
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
16681671
gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
16691672
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=

‎pkg/minikube/bootstrapper/images/images_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
func TestAuxiliary(t *testing.T) {
2626
want := []string{
27-
"gcr.io/k8s-minikube/storage-provisioner:v3",
27+
"gcr.io/k8s-minikube/storage-provisioner:v4",
2828
"docker.io/kubernetesui/dashboard:v2.0.3",
2929
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
3030
}
@@ -36,7 +36,7 @@ func TestAuxiliary(t *testing.T) {
3636

3737
func TestAuxiliaryMirror(t *testing.T) {
3838
want := []string{
39-
"test.mirror/storage-provisioner:v3",
39+
"test.mirror/storage-provisioner:v4",
4040
"test.mirror/dashboard:v2.0.3",
4141
"test.mirror/metrics-scraper:v1.0.4",
4242
}

‎pkg/minikube/bootstrapper/images/kubeadm_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestKubeadmImages(t *testing.T) {
3737
"k8s.gcr.io/coredns:1.6.5",
3838
"k8s.gcr.io/etcd:3.4.3-0",
3939
"k8s.gcr.io/pause:3.1",
40-
"gcr.io/k8s-minikube/storage-provisioner:v3",
40+
"gcr.io/k8s-minikube/storage-provisioner:v4",
4141
"docker.io/kubernetesui/dashboard:v2.0.3",
4242
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
4343
}},
@@ -49,7 +49,7 @@ func TestKubeadmImages(t *testing.T) {
4949
"mirror.k8s.io/coredns:1.6.2",
5050
"mirror.k8s.io/etcd:3.3.15-0",
5151
"mirror.k8s.io/pause:3.1",
52-
"mirror.k8s.io/storage-provisioner:v3",
52+
"mirror.k8s.io/storage-provisioner:v4",
5353
"mirror.k8s.io/dashboard:v2.0.3",
5454
"mirror.k8s.io/metrics-scraper:v1.0.4",
5555
}},
@@ -61,7 +61,7 @@ func TestKubeadmImages(t *testing.T) {
6161
"k8s.gcr.io/coredns:1.3.1",
6262
"k8s.gcr.io/etcd:3.3.10",
6363
"k8s.gcr.io/pause:3.1",
64-
"gcr.io/k8s-minikube/storage-provisioner:v3",
64+
"gcr.io/k8s-minikube/storage-provisioner:v4",
6565
"docker.io/kubernetesui/dashboard:v2.0.3",
6666
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
6767
}},
@@ -73,7 +73,7 @@ func TestKubeadmImages(t *testing.T) {
7373
"k8s.gcr.io/coredns:1.3.1",
7474
"k8s.gcr.io/etcd:3.3.10",
7575
"k8s.gcr.io/pause:3.1",
76-
"gcr.io/k8s-minikube/storage-provisioner:v3",
76+
"gcr.io/k8s-minikube/storage-provisioner:v4",
7777
"docker.io/kubernetesui/dashboard:v2.0.3",
7878
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
7979
}},
@@ -85,7 +85,7 @@ func TestKubeadmImages(t *testing.T) {
8585
"k8s.gcr.io/coredns:1.2.6",
8686
"k8s.gcr.io/etcd:3.2.24",
8787
"k8s.gcr.io/pause:3.1",
88-
"gcr.io/k8s-minikube/storage-provisioner:v3",
88+
"gcr.io/k8s-minikube/storage-provisioner:v4",
8989
"docker.io/kubernetesui/dashboard:v2.0.3",
9090
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
9191
}},
@@ -97,7 +97,7 @@ func TestKubeadmImages(t *testing.T) {
9797
"k8s.gcr.io/coredns:1.2.2",
9898
"k8s.gcr.io/etcd:3.2.24",
9999
"k8s.gcr.io/pause:3.1",
100-
"gcr.io/k8s-minikube/storage-provisioner:v3",
100+
"gcr.io/k8s-minikube/storage-provisioner:v4",
101101
"docker.io/kubernetesui/dashboard:v2.0.3",
102102
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
103103
}},

‎pkg/minikube/cruntime/containerd_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestAddRepoTagToImageName(t *testing.T) {
2727
}{
2828
{"kubernetesui/dashboard:v2.0.3", "docker.io/kubernetesui/dashboard:v2.0.3"},
2929
{"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"},
30-
{"gcr.io/k8s-minikube/storage-provisioner:v3", "gcr.io/k8s-minikube/storage-provisioner:v3"},
30+
{"gcr.io/k8s-minikube/storage-provisioner:v4", "gcr.io/k8s-minikube/storage-provisioner:v4"},
3131
}
3232
for _, tc := range tests {
3333
t.Run(tc.imgName, func(t *testing.T) {

‎pkg/minikube/download/preload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const (
4141
// PreloadVersion is the current version of the preloaded tarball
4242
//
4343
// NOTE: You may need to bump this version up when upgrading auxiliary docker images
44-
PreloadVersion = "v6"
44+
PreloadVersion = "v7"
4545
// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
4646
PreloadBucket = "minikube-preloaded-volume-tarballs"
4747
)

0 commit comments

Comments
 (0)