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

Merge pull request #9129 from tstromberg/dashboard-bump 

Update dashboard to v2.0.3
pull/8372/head^2
Thomas Strömberg 2020-09-01 16:01:47 -07:00 committed by GitHub
parent 543247a1af 69214c08bb
commit d84f87b3f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/addons/dashboard/dashboard-dp.yaml
View File

@ -90,7 +90,7 @@ spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
# WARNING: This must match pkg/minikube/bootstrapper/images/images.go # WARNING: This must match pkg/minikube/bootstrapper/images/images.go
image: kubernetesui/dashboard:v2.0.1 image: kubernetesui/dashboard:v2.0.3
ports: ports:
- containerPort: 9090 - containerPort: 9090
protocol: TCP protocol: TCP

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

@ -141,7 +141,7 @@ func dashboardFrontend(repo string) string {
repo = "kubernetesui" repo = "kubernetesui"
} }
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml // See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
return path.Join(repo, "dashboard:v2.0.1") return path.Join(repo, "dashboard:v2.0.3")
} }
// dashboardMetrics returns the image used for the dashboard metrics scraper // dashboardMetrics returns the image used for the dashboard metrics scraper

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

@ -25,7 +25,7 @@ import (
func TestAuxiliary(t *testing.T) { func TestAuxiliary(t *testing.T) {
want := []string{ want := []string{
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
} }
got := auxiliary("") got := auxiliary("")
@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) {
func TestAuxiliaryMirror(t *testing.T) { func TestAuxiliaryMirror(t *testing.T) {
want := []string{ want := []string{
"test.mirror/storage-provisioner:v2", "test.mirror/storage-provisioner:v2",
"test.mirror/dashboard:v2.0.1", "test.mirror/dashboard:v2.0.3",
"test.mirror/metrics-scraper:v1.0.4", "test.mirror/metrics-scraper:v1.0.4",
} }
got := auxiliary("test.mirror") got := auxiliary("test.mirror")

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

@ -38,7 +38,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.4.3-0", "k8s.gcr.io/etcd:3.4.3-0",
"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.1",
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
}}, }},
{"v1.16.1", "mirror.k8s.io", []string{ {"v1.16.1", "mirror.k8s.io", []string{
@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) {
"mirror.k8s.io/etcd:3.3.15-0", "mirror.k8s.io/etcd:3.3.15-0",
"mirror.k8s.io/pause:3.1", "mirror.k8s.io/pause:3.1",
"mirror.k8s.io/storage-provisioner:v2", "mirror.k8s.io/storage-provisioner:v2",
"mirror.k8s.io/dashboard:v2.0.1", "mirror.k8s.io/dashboard:v2.0.3",
"mirror.k8s.io/metrics-scraper:v1.0.4", "mirror.k8s.io/metrics-scraper:v1.0.4",
}}, }},
{"v1.15.0", "", []string{ {"v1.15.0", "", []string{
@ -62,7 +62,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/etcd:3.3.10",
"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.1",
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
}}, }},
{"v1.14.0", "", []string{ {"v1.14.0", "", []string{
@ -74,7 +74,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/etcd:3.3.10",
"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.1",
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
}}, }},
{"v1.13.0", "", []string{ {"v1.13.0", "", []string{
@ -86,7 +86,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/etcd:3.2.24",
"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.1",
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
}}, }},
{"v1.12.0", "", []string{ {"v1.12.0", "", []string{
@ -98,7 +98,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/etcd:3.2.24",
"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.1",
"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2",
"kubernetesui/dashboard:v2.0.1", "kubernetesui/dashboard:v2.0.3",
"kubernetesui/metrics-scraper:v1.0.4", "kubernetesui/metrics-scraper:v1.0.4",
}}, }},
} }

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

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