fix unit tests, change addon yaml, bump preload version
Sharif Elgamal
parent
ea81f09058
commit
40c44fa1ef
103
go.mod
103
go.mod
|
|
@ -99,112 +99,9 @@ require (
|
|||
)
|
||||
|
||||
require (
|
||||
cloud.google.com/go v0.93.3 // indirect
|
||||
cloud.google.com/go/container v0.1.0 // indirect
|
||||
cloud.google.com/go/monitoring v0.1.0 // indirect
|
||||
cloud.google.com/go/trace v0.1.0 // indirect
|
||||
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
|
||||
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
|
||||
github.com/Microsoft/go-winio v0.5.0 // indirect
|
||||
github.com/StackExchange/wmi v1.2.1 // indirect
|
||||
github.com/VividCortex/ewma v1.1.1 // indirect
|
||||
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af // indirect
|
||||
github.com/aws/aws-sdk-go v1.35.24 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
github.com/containerd/cgroups v1.0.1 // indirect
|
||||
github.com/containerd/containerd v1.5.2 // indirect
|
||||
github.com/containerd/stargz-snapshotter/estargz v0.7.0 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/docker/cli v20.10.7+incompatible // indirect
|
||||
github.com/docker/distribution v2.7.1+incompatible // indirect
|
||||
github.com/docker/docker-credential-helpers v0.6.3 // indirect
|
||||
github.com/docker/go-connections v0.4.0 // indirect
|
||||
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
|
||||
github.com/fatih/color v1.10.0 // indirect
|
||||
github.com/fogleman/gg v1.3.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.4.9 // indirect
|
||||
github.com/go-fonts/liberation v0.1.1 // indirect
|
||||
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07 // indirect
|
||||
github.com/go-logr/logr v1.0.0 // indirect
|
||||
github.com/go-ole/go-ole v1.2.5 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/golang/snappy v0.0.3 // indirect
|
||||
github.com/google/go-querystring v1.0.0 // indirect
|
||||
github.com/google/gofuzz v1.1.0 // indirect
|
||||
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
|
||||
github.com/googleapis/gnostic v0.4.1 // indirect
|
||||
github.com/gookit/color v1.4.2 // indirect
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
|
||||
github.com/hashicorp/go-safetemp v1.0.0 // indirect
|
||||
github.com/hashicorp/go-version v1.2.1 // indirect
|
||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||
github.com/imdario/mergo v0.3.11 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||
github.com/jmespath/go-jmespath v0.4.0 // indirect
|
||||
github.com/json-iterator/go v1.1.11 // indirect
|
||||
github.com/klauspost/compress v1.13.0 // indirect
|
||||
github.com/magiconair/properties v1.8.5 // indirect
|
||||
github.com/mattn/go-colorable v0.1.8 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.13 // indirect
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
|
||||
github.com/miekg/dns v1.1.35 // indirect
|
||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
|
||||
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
|
||||
github.com/mitchellh/mapstructure v1.4.1 // indirect
|
||||
github.com/moby/spdystream v0.2.0 // indirect
|
||||
github.com/moby/sys/mountinfo v0.4.1 // indirect
|
||||
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
||||
github.com/opencontainers/image-spec v1.0.1 // indirect
|
||||
github.com/opencontainers/runc v1.0.0-rc95 // indirect
|
||||
github.com/pelletier/go-toml v1.9.3 // indirect
|
||||
github.com/phpdave11/gofpdf v1.4.2 // indirect
|
||||
github.com/prometheus/client_golang v1.7.1 // indirect
|
||||
github.com/prometheus/client_model v0.2.0 // indirect
|
||||
github.com/prometheus/common v0.10.0 // indirect
|
||||
github.com/prometheus/procfs v0.6.0 // indirect
|
||||
github.com/rivo/uniseg v0.2.0 // indirect
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
github.com/sirupsen/logrus v1.8.1 // indirect
|
||||
github.com/spf13/afero v1.6.0 // indirect
|
||||
github.com/spf13/cast v1.3.1 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||
github.com/subosito/gotenv v1.2.0 // indirect
|
||||
github.com/tklauser/go-sysconf v0.3.9 // indirect
|
||||
github.com/tklauser/numcpus v0.3.0 // indirect
|
||||
github.com/ulikunitz/xz v0.5.8 // indirect
|
||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
|
||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
|
||||
go.opentelemetry.io/otel/metric v0.17.0 // indirect
|
||||
go.uber.org/atomic v1.7.0 // indirect
|
||||
go.uber.org/multierr v1.6.0 // indirect
|
||||
go.uber.org/zap v1.17.0 // indirect
|
||||
golang.org/x/image v0.0.0-20210216034530-4410531fe030 // indirect
|
||||
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
|
||||
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
|
||||
google.golang.org/grpc v1.40.0 // indirect
|
||||
google.golang.org/protobuf v1.27.1 // indirect
|
||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||
gopkg.in/ini.v1 v1.62.0 // indirect
|
||||
k8s.io/cluster-bootstrap v0.0.0 // indirect
|
||||
k8s.io/component-base v0.21.2 // indirect
|
||||
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
|
||||
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
|
||||
sigs.k8s.io/yaml v1.2.0 // indirect
|
||||
)
|
||||
|
||||
replace (
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ var Addons = map[string]*Addon{
|
|||
MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"),
|
||||
MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"),
|
||||
}, false, "dashboard", "kubernetes", map[string]string{
|
||||
"Dashboard": "kubernetesui/dashboard:v2.1.0@sha256:7f80b5ba141bead69c4fee8661464857af300d7d7ed0274cf7beecedc00322e6",
|
||||
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.4@sha256:555981a24f184420f3be0c79d4efb6c948a85cfce84034f85a563f4151a81cbf",
|
||||
"Dashboard": "kubernetesui/dashboard:v2.3.1@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
|
||||
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.7@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
|
||||
}, nil),
|
||||
"default-storageclass": NewAddon([]*BinAsset{
|
||||
MustBinAsset(addons.DefaultStorageClassAssets,
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ k8s.gcr.io/coredns/coredns:v1.8.4
|
|||
func TestAuxiliary(t *testing.T) {
|
||||
want := []string{
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}
|
||||
got := auxiliary("")
|
||||
if diff := cmp.Diff(want, got); diff != "" {
|
||||
|
|
@ -106,8 +106,8 @@ func TestAuxiliary(t *testing.T) {
|
|||
func TestAuxiliaryMirror(t *testing.T) {
|
||||
want := []string{
|
||||
"test.mirror/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"test.mirror/kubernetesui/dashboard:v2.1.0",
|
||||
"test.mirror/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"test.mirror/kubernetesui/dashboard:v2.3.1",
|
||||
"test.mirror/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}
|
||||
got := auxiliary("test.mirror")
|
||||
if diff := cmp.Diff(want, got); diff != "" {
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"k8s.gcr.io/etcd:3.4.3-0",
|
||||
"k8s.gcr.io/pause:3.1",
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.16.1", "mirror.k8s.io", false, []string{
|
||||
"mirror.k8s.io/kube-proxy:v1.16.1",
|
||||
|
|
@ -55,8 +55,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"mirror.k8s.io/etcd:3.3.15-0",
|
||||
"mirror.k8s.io/pause:3.1",
|
||||
"mirror.k8s.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"mirror.k8s.io/kubernetesui/dashboard:v2.1.0",
|
||||
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"mirror.k8s.io/kubernetesui/dashboard:v2.3.1",
|
||||
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.15.0", "", false, []string{
|
||||
"k8s.gcr.io/kube-proxy:v1.15.0",
|
||||
|
|
@ -67,8 +67,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"k8s.gcr.io/etcd:3.3.10",
|
||||
"k8s.gcr.io/pause:3.1",
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.14.0", "", false, []string{
|
||||
"k8s.gcr.io/kube-proxy:v1.14.0",
|
||||
|
|
@ -79,8 +79,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"k8s.gcr.io/etcd:3.3.10",
|
||||
"k8s.gcr.io/pause:3.1",
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.13.0", "", false, []string{
|
||||
"k8s.gcr.io/kube-proxy:v1.13.0",
|
||||
|
|
@ -91,8 +91,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"k8s.gcr.io/etcd:3.2.24",
|
||||
"k8s.gcr.io/pause:3.1",
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.12.0", "", false, []string{
|
||||
"k8s.gcr.io/kube-proxy:v1.12.0",
|
||||
|
|
@ -103,8 +103,8 @@ func TestKubeadmImages(t *testing.T) {
|
|||
"k8s.gcr.io/etcd:3.2.24",
|
||||
"k8s.gcr.io/pause:3.1",
|
||||
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
|
||||
"docker.io/kubernetesui/dashboard:v2.1.0",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
|
||||
"docker.io/kubernetesui/dashboard:v2.3.1",
|
||||
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
|
||||
}},
|
||||
{"v1.11.0", "", true, nil},
|
||||
{"v1.10.0", "", true, nil},
|
||||
|
|
|
|||
|
|
@ -43,7 +43,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 = "v12"
|
||||
PreloadVersion = "v13"
|
||||
// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
|
||||
PreloadBucket = "minikube-preloaded-volume-tarballs"
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue