Skip to content

Commit a86693c

Browse files
sharifelgamalsharifelgamal
authored
Merge pull request #12475 from leifcr/patch-2
Use newer dashboard, to support ingress extensions
2 parents 4607e39 + 61432f7 commit a86693c

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎pkg/minikube/assets/addons.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ var Addons = map[string]*Addon{
134134
MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"),
135135
MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"),
136136
}, false, "dashboard", "kubernetes", map[string]string{
137-
"Dashboard": "kubernetesui/dashboard:v2.1.0@sha256:7f80b5ba141bead69c4fee8661464857af300d7d7ed0274cf7beecedc00322e6",
138-
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.4@sha256:555981a24f184420f3be0c79d4efb6c948a85cfce84034f85a563f4151a81cbf",
137+
"Dashboard": "kubernetesui/dashboard:v2.3.1@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
138+
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.7@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
139139
}, nil),
140140
"default-storageclass": NewAddon([]*BinAsset{
141141
MustBinAsset(addons.DefaultStorageClassAssets,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func dashboardFrontend(repo string) string {
146146
repo = "docker.io"
147147
}
148148
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
149-
return path.Join(repo, "kubernetesui", "dashboard:v2.1.0")
149+
return path.Join(repo, "kubernetesui", "dashboard:v2.3.1")
150150
}
151151

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

161161
// KindNet returns the image used for kindnet

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ k8s.gcr.io/coredns/coredns:v1.8.4
9494
func TestAuxiliary(t *testing.T) {
9595
want := []string{
9696
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
97-
"docker.io/kubernetesui/dashboard:v2.1.0",
98-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
97+
"docker.io/kubernetesui/dashboard:v2.3.1",
98+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
9999
}
100100
got := auxiliary("")
101101
if diff := cmp.Diff(want, got); diff != "" {
@@ -106,8 +106,8 @@ func TestAuxiliary(t *testing.T) {
106106
func TestAuxiliaryMirror(t *testing.T) {
107107
want := []string{
108108
"test.mirror/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
109-
"test.mirror/kubernetesui/dashboard:v2.1.0",
110-
"test.mirror/kubernetesui/metrics-scraper:v1.0.4",
109+
"test.mirror/kubernetesui/dashboard:v2.3.1",
110+
"test.mirror/kubernetesui/metrics-scraper:v1.0.7",
111111
}
112112
got := auxiliary("test.mirror")
113113
if diff := cmp.Diff(want, got); diff != "" {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ func TestKubeadmImages(t *testing.T) {
4343
"k8s.gcr.io/etcd:3.4.3-0",
4444
"k8s.gcr.io/pause:3.1",
4545
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
46-
"docker.io/kubernetesui/dashboard:v2.1.0",
47-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
46+
"docker.io/kubernetesui/dashboard:v2.3.1",
47+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
4848
}},
4949
{"v1.16.1", "mirror.k8s.io", false, []string{
5050
"mirror.k8s.io/kube-proxy:v1.16.1",
@@ -55,8 +55,8 @@ func TestKubeadmImages(t *testing.T) {
5555
"mirror.k8s.io/etcd:3.3.15-0",
5656
"mirror.k8s.io/pause:3.1",
5757
"mirror.k8s.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
58-
"mirror.k8s.io/kubernetesui/dashboard:v2.1.0",
59-
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.4",
58+
"mirror.k8s.io/kubernetesui/dashboard:v2.3.1",
59+
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.7",
6060
}},
6161
{"v1.15.0", "", false, []string{
6262
"k8s.gcr.io/kube-proxy:v1.15.0",
@@ -67,8 +67,8 @@ func TestKubeadmImages(t *testing.T) {
6767
"k8s.gcr.io/etcd:3.3.10",
6868
"k8s.gcr.io/pause:3.1",
6969
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
70-
"docker.io/kubernetesui/dashboard:v2.1.0",
71-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
70+
"docker.io/kubernetesui/dashboard:v2.3.1",
71+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
7272
}},
7373
{"v1.14.0", "", false, []string{
7474
"k8s.gcr.io/kube-proxy:v1.14.0",
@@ -79,8 +79,8 @@ func TestKubeadmImages(t *testing.T) {
7979
"k8s.gcr.io/etcd:3.3.10",
8080
"k8s.gcr.io/pause:3.1",
8181
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
82-
"docker.io/kubernetesui/dashboard:v2.1.0",
83-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
82+
"docker.io/kubernetesui/dashboard:v2.3.1",
83+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
8484
}},
8585
{"v1.13.0", "", false, []string{
8686
"k8s.gcr.io/kube-proxy:v1.13.0",
@@ -91,8 +91,8 @@ func TestKubeadmImages(t *testing.T) {
9191
"k8s.gcr.io/etcd:3.2.24",
9292
"k8s.gcr.io/pause:3.1",
9393
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
94-
"docker.io/kubernetesui/dashboard:v2.1.0",
95-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
94+
"docker.io/kubernetesui/dashboard:v2.3.1",
95+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
9696
}},
9797
{"v1.12.0", "", false, []string{
9898
"k8s.gcr.io/kube-proxy:v1.12.0",
@@ -103,8 +103,8 @@ func TestKubeadmImages(t *testing.T) {
103103
"k8s.gcr.io/etcd:3.2.24",
104104
"k8s.gcr.io/pause:3.1",
105105
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
106-
"docker.io/kubernetesui/dashboard:v2.1.0",
107-
"docker.io/kubernetesui/metrics-scraper:v1.0.4",
106+
"docker.io/kubernetesui/dashboard:v2.3.1",
107+
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
108108
}},
109109
{"v1.11.0", "", true, nil},
110110
{"v1.10.0", "", true, nil},

‎pkg/minikube/download/preload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const (
4343
// PreloadVersion is the current version of the preloaded tarball
4444
//
4545
// NOTE: You may need to bump this version up when upgrading auxiliary docker images
46-
PreloadVersion = "v12"
46+
PreloadVersion = "v13"
4747
// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
4848
PreloadBucket = "minikube-preloaded-volume-tarballs"
4949
)

0 commit comments

Comments
 (0)