Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use newer dashboard, to support ingress extensions #12475

Merged
merged 3 commits into from
Sep 16, 2021
Merged

Use newer dashboard, to support ingress extensions #12475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea81f09
Use newer dashboard, to support ingress extensions
leifcr Sep 14, 2021
40c44fa
fix unit tests, change addon yaml, bump preload version
sharifelgamal Sep 16, 2021
61432f7
fix go mod
sharifelgamal Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/minikube/assets/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/bootstrapper/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func dashboardFrontend(repo string) string {
repo = "docker.io"
}
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
return path.Join(repo, "kubernetesui", "dashboard:v2.1.0")
return path.Join(repo, "kubernetesui", "dashboard:v2.3.1")
}

// dashboardMetrics returns the image used for the dashboard metrics scraper
Expand All @@ -155,7 +155,7 @@ func dashboardMetrics(repo string) string {
repo = "docker.io"
}
// See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml
return path.Join(repo, "kubernetesui", "metrics-scraper:v1.0.4")
return path.Join(repo, "kubernetesui", "metrics-scraper:v1.0.7")
}

// KindNet returns the image used for kindnet
Expand Down
8 changes: 4 additions & 4 deletions pkg/minikube/bootstrapper/images/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand All @@ -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 != "" {
Expand Down
24 changes: 12 additions & 12 deletions pkg/minikube/bootstrapper/images/kubeadm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/preload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down