Skip to content

Commit 84365fe

Browse files
author
priyawadhwa
authored
Merge pull request #8294 from maciaszczykm/dashboard-v2.0.1
Bump Dashboard to v2.0.1
2 parents 977411b + d02b4b0 commit 84365fe

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

deploy/addons/dashboard/dashboard-dp.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
spec:
3737
containers:
3838
- name: dashboard-metrics-scraper
39-
image: kubernetesui/metrics-scraper:v1.0.2
39+
image: kubernetesui/metrics-scraper:v1.0.4
4040
ports:
4141
- containerPort: 8000
4242
protocol: TCP
@@ -73,7 +73,7 @@ metadata:
7373
labels:
7474
k8s-app: kubernetes-dashboard
7575
kubernetes.io/minikube-addons: dashboard
76-
addonmanager.kubernetes.io/mode: Reconcile
76+
addonmanager.kubernetes.io/mode: Reconcile
7777
name: kubernetes-dashboard
7878
namespace: kubernetes-dashboard
7979
spec:
@@ -90,7 +90,7 @@ spec:
9090
containers:
9191
- name: kubernetes-dashboard
9292
# WARNING: This must match pkg/minikube/bootstrapper/images/images.go
93-
image: kubernetesui/dashboard:v2.0.0
93+
image: kubernetesui/dashboard:v2.0.1
9494
ports:
9595
- containerPort: 9090
9696
protocol: TCP

pkg/minikube/bootstrapper/images/images.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func dashboardFrontend(repo string) string {
135135
repo = "kubernetesui"
136136
}
137137
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
138-
return path.Join(repo, "dashboard:v2.0.0")
138+
return path.Join(repo, "dashboard:v2.0.1")
139139
}
140140

141141
// dashboardMetrics returns the image used for the dashboard metrics scraper
@@ -144,5 +144,5 @@ func dashboardMetrics(repo string) string {
144144
repo = "kubernetesui"
145145
}
146146
// See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml
147-
return path.Join(repo, "metrics-scraper:v1.0.2")
147+
return path.Join(repo, "metrics-scraper:v1.0.4")
148148
}

pkg/minikube/bootstrapper/images/images_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
func TestAuxiliary(t *testing.T) {
2626
want := []string{
2727
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
28-
"kubernetesui/dashboard:v2.0.0",
29-
"kubernetesui/metrics-scraper:v1.0.2",
28+
"kubernetesui/dashboard:v2.0.1",
29+
"kubernetesui/metrics-scraper:v1.0.4",
3030
}
3131
got := auxiliary("")
3232
if diff := cmp.Diff(want, got); diff != "" {
@@ -37,8 +37,8 @@ func TestAuxiliary(t *testing.T) {
3737
func TestAuxiliaryMirror(t *testing.T) {
3838
want := []string{
3939
"test.mirror/storage-provisioner:v1.8.1",
40-
"test.mirror/dashboard:v2.0.0",
41-
"test.mirror/metrics-scraper:v1.0.2",
40+
"test.mirror/dashboard:v2.0.1",
41+
"test.mirror/metrics-scraper:v1.0.4",
4242
}
4343
got := auxiliary("test.mirror")
4444
if diff := cmp.Diff(want, got); diff != "" {

pkg/minikube/bootstrapper/images/kubeadm_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func TestKubeadmImages(t *testing.T) {
3838
"k8s.gcr.io/etcd:3.4.3-0",
3939
"k8s.gcr.io/pause:3.1",
4040
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
41-
"kubernetesui/dashboard:v2.0.0",
42-
"kubernetesui/metrics-scraper:v1.0.2",
41+
"kubernetesui/dashboard:v2.0.1",
42+
"kubernetesui/metrics-scraper:v1.0.4",
4343
}},
4444
{"v1.16.1", "mirror.k8s.io", []string{
4545
"mirror.k8s.io/kube-proxy:v1.16.1",
@@ -50,8 +50,8 @@ func TestKubeadmImages(t *testing.T) {
5050
"mirror.k8s.io/etcd:3.3.15-0",
5151
"mirror.k8s.io/pause:3.1",
5252
"mirror.k8s.io/storage-provisioner:v1.8.1",
53-
"mirror.k8s.io/dashboard:v2.0.0",
54-
"mirror.k8s.io/metrics-scraper:v1.0.2",
53+
"mirror.k8s.io/dashboard:v2.0.1",
54+
"mirror.k8s.io/metrics-scraper:v1.0.4",
5555
}},
5656
{"v1.15.0", "", []string{
5757
"k8s.gcr.io/kube-proxy:v1.15.0",
@@ -62,8 +62,8 @@ func TestKubeadmImages(t *testing.T) {
6262
"k8s.gcr.io/etcd:3.3.10",
6363
"k8s.gcr.io/pause:3.1",
6464
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
65-
"kubernetesui/dashboard:v2.0.0",
66-
"kubernetesui/metrics-scraper:v1.0.2",
65+
"kubernetesui/dashboard:v2.0.1",
66+
"kubernetesui/metrics-scraper:v1.0.4",
6767
}},
6868
{"v1.14.0", "", []string{
6969
"k8s.gcr.io/kube-proxy:v1.14.0",
@@ -74,8 +74,8 @@ func TestKubeadmImages(t *testing.T) {
7474
"k8s.gcr.io/etcd:3.3.10",
7575
"k8s.gcr.io/pause:3.1",
7676
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
77-
"kubernetesui/dashboard:v2.0.0",
78-
"kubernetesui/metrics-scraper:v1.0.2",
77+
"kubernetesui/dashboard:v2.0.1",
78+
"kubernetesui/metrics-scraper:v1.0.4",
7979
}},
8080
{"v1.13.0", "", []string{
8181
"k8s.gcr.io/kube-proxy:v1.13.0",
@@ -86,8 +86,8 @@ func TestKubeadmImages(t *testing.T) {
8686
"k8s.gcr.io/etcd:3.2.24",
8787
"k8s.gcr.io/pause:3.1",
8888
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
89-
"kubernetesui/dashboard:v2.0.0",
90-
"kubernetesui/metrics-scraper:v1.0.2",
89+
"kubernetesui/dashboard:v2.0.1",
90+
"kubernetesui/metrics-scraper:v1.0.4",
9191
}},
9292
{"v1.12.0", "", []string{
9393
"k8s.gcr.io/kube-proxy:v1.12.0",
@@ -98,8 +98,8 @@ func TestKubeadmImages(t *testing.T) {
9898
"k8s.gcr.io/etcd:3.2.24",
9999
"k8s.gcr.io/pause:3.1",
100100
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
101-
"kubernetesui/dashboard:v2.0.0",
102-
"kubernetesui/metrics-scraper:v1.0.2",
101+
"kubernetesui/dashboard:v2.0.1",
102+
"kubernetesui/metrics-scraper:v1.0.4",
103103
}},
104104
}
105105
for _, tc := range tests {

pkg/minikube/cruntime/containerd_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func TestAddRepoTagToImageName(t *testing.T) {
2525
imgName string
2626
want string
2727
}{
28-
{"kubernetesui/dashboard:v2.0.0-rc6", "docker.io/kubernetesui/dashboard:v2.0.0-rc6"},
29-
{"kubernetesui/metrics-scraper:v1.0.2", "docker.io/kubernetesui/metrics-scraper:v1.0.2"},
28+
{"kubernetesui/dashboard:v2.0.1", "docker.io/kubernetesui/dashboard:v2.0.1"},
29+
{"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"},
3030
{"gcr.io/k8s-minikube/storage-provisioner:v1.8.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1"},
3131
}
3232
for _, tc := range tests {

pkg/minikube/download/preload.go

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

0 commit comments

Comments
 (0)