kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrade kubernetes dashboard from v2.3.1 to v2.5.0

pull/13741/head
ziyi-xie 2022-03-02 05:17:31 +00:00
parent cc7b6b9741
commit 771d71911c
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/minikube/assets/addons.go
View File

@ -134,7 +134,7 @@ 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.3.1@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
"Dashboard": "kubernetesui/dashboard:v2.5.0@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.7@sha256:36d5b3f60e1a144cc5ada820910535074bdf5cf73fb70d1ff1681537eef4e172",
}, nil),
"default-storageclass": NewAddon([]*BinAsset{

2
pkg/minikube/bootstrapper/images/images.go
View File

@ -121,7 +121,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.3.1")
return path.Join(repo, "kubernetesui", "dashboard:v2.5.0")
}
// dashboardMetrics returns the image used for the dashboard metrics scraper

4
pkg/minikube/bootstrapper/images/images_test.go
View File

@ -94,7 +94,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}
got := auxiliary("")
@ -106,7 +106,7 @@ 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.3.1",
"test.mirror/kubernetesui/dashboard:v2.5.0",
"test.mirror/kubernetesui/metrics-scraper:v1.0.7",
}
got := auxiliary("test.mirror")

12
pkg/minikube/bootstrapper/images/kubeadm_test.go
View File

@ -43,7 +43,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.16.1", "mirror.k8s.io", false, []string{
@ -55,7 +55,7 @@ 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.3.1",
"mirror.k8s.io/kubernetesui/dashboard:v2.5.0",
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.15.0", "", false, []string{
@ -67,7 +67,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.14.0", "", false, []string{
@ -79,7 +79,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.13.0", "", false, []string{
@ -91,7 +91,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.12.0", "", false, []string{
@ -103,7 +103,7 @@ 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.3.1",
"docker.io/kubernetesui/dashboard:v2.5.0",
"docker.io/kubernetesui/metrics-scraper:v1.0.7",
}},
{"v1.11.0", "", true, nil},

2
pkg/minikube/cruntime/containerd_test.go
View File

@ -27,7 +27,7 @@ func TestAddRepoTagToImageName(t *testing.T) {
imgName string
want string
}{
{"kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.1.0"},
{"kubernetesui/dashboard:v2.5.0", "docker.io/kubernetesui/dashboard:v2.5.0"},
{"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"},
{"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion()},
}

4
test/integration/start_stop_delete_test.go
View File

@ -431,10 +431,10 @@ func testPause(ctx context.Context, t *testing.T, profile string) {
// Remove container-specific prefixes for naming consistency
// for example in `docker` runtime we get this:
// $ docker@minikube:~$ sudo crictl images -o json | grep dash
// "kubernetesui/dashboard:v2.1.0"
// "kubernetesui/dashboard:v2.5.0"
// but for 'containerd' we get full name
// $ docker@minikube:~$ sudo crictl images -o json | grep dash
// "docker.io/kubernetesui/dashboard:v2.1.0"
// "docker.io/kubernetesui/dashboard:v2.5.0"
func trimImageName(name string) string {
name = strings.TrimPrefix(name, "docker.io/")
name = strings.TrimPrefix(name, "localhost/")