Skip to content

Commit 267f021

Browse files
authored
Merge pull request #14269 from ziyi-xie/upgrade-dashboard
upgrade Dashboard addon from v2.5.1 to v2.6.0, MetricsScraper from v1.0.7 to v1.0.8
2 parents 919e0da + ab7bb61 commit 267f021

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: pkg/minikube/assets/addons.go

+2-2
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.5.1@sha256:cc746e7a0b1eec0db01cbabbb6386b23d7af97e79fa9e36bb883a95b7eb96fe2",
138-
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.7@sha256:36d5b3f60e1a144cc5ada820910535074bdf5cf73fb70d1ff1681537eef4e172",
137+
"Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3",
138+
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c",
139139
}, nil),
140140
"default-storageclass": NewAddon([]*BinAsset{
141141
MustBinAsset(addons.DefaultStorageClassAssets,

Diff for: test/integration/start_stop_delete_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ func testPause(ctx context.Context, t *testing.T, profile string) {
448448
// Remove container-specific prefixes for naming consistency
449449
// for example in `docker` runtime we get this:
450450
// $ docker@minikube:~$ sudo crictl images -o json | grep dash
451-
// "kubernetesui/dashboard:v2.5.1"
451+
// "kubernetesui/dashboard:vX.X.X"
452452
// but for 'containerd' we get full name
453453
// $ docker@minikube:~$ sudo crictl images -o json | grep dash
454-
// "docker.io/kubernetesui/dashboard:v2.5.1"
454+
// "docker.io/kubernetesui/dashboard:vX.X.X"
455455
func trimImageName(name string) string {
456456
name = strings.TrimPrefix(name, "docker.io/")
457457
name = strings.TrimPrefix(name, "localhost/")

0 commit comments

Comments
 (0)