From 464bd48ea1782d20ae55b3ee1002db1175f81f05 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Sun, 30 Aug 2020 22:32:20 -0700 Subject: [PATCH 1/2] Update dashboard to v2.0.3 --- deploy/addons/dashboard/dashboard-dp.yaml | 2 +- pkg/minikube/bootstrapper/images/images_test.go | 2 +- pkg/minikube/bootstrapper/images/kubeadm_test.go | 10 +++++----- pkg/minikube/cruntime/containerd_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/addons/dashboard/dashboard-dp.yaml b/deploy/addons/dashboard/dashboard-dp.yaml index aec28edf6367..157db6f22f5e 100644 --- a/deploy/addons/dashboard/dashboard-dp.yaml +++ b/deploy/addons/dashboard/dashboard-dp.yaml @@ -90,7 +90,7 @@ spec: containers: - name: kubernetes-dashboard # WARNING: This must match pkg/minikube/bootstrapper/images/images.go - image: kubernetesui/dashboard:v2.0.1 + image: kubernetesui/dashboard:v2.0.3 ports: - containerPort: 9090 protocol: TCP diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index 2bc369b87c1c..5661f3bd3e59 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -25,7 +25,7 @@ import ( func TestAuxiliary(t *testing.T) { want := []string{ "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", } got := auxiliary("") diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index f1348ce90172..89e0c1c6fccd 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -38,7 +38,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:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.16.1", "mirror.k8s.io", []string{ @@ -62,7 +62,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:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.14.0", "", []string{ @@ -74,7 +74,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:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.13.0", "", []string{ @@ -86,7 +86,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:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.12.0", "", []string{ @@ -98,7 +98,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:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, } diff --git a/pkg/minikube/cruntime/containerd_test.go b/pkg/minikube/cruntime/containerd_test.go index 5b1e6414f9ef..93a58ae001f4 100644 --- a/pkg/minikube/cruntime/containerd_test.go +++ b/pkg/minikube/cruntime/containerd_test.go @@ -25,7 +25,7 @@ func TestAddRepoTagToImageName(t *testing.T) { imgName 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"}, {"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2"}, } From 69214c08bb1ce14a4f4bfba980540b375a97f87b Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 31 Aug 2020 11:11:25 -0700 Subject: [PATCH 2/2] Update test data --- pkg/minikube/bootstrapper/images/images.go | 2 +- pkg/minikube/bootstrapper/images/images_test.go | 2 +- pkg/minikube/bootstrapper/images/kubeadm_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 6cf71f0e07f2..631e62510e92 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -141,7 +141,7 @@ func dashboardFrontend(repo string) string { repo = "kubernetesui" } // 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 diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index 5661f3bd3e59..5b7fe848090b 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) { func TestAuxiliaryMirror(t *testing.T) { want := []string{ "test.mirror/storage-provisioner:v2", - "test.mirror/dashboard:v2.0.1", + "test.mirror/dashboard:v2.0.3", "test.mirror/metrics-scraper:v1.0.4", } got := auxiliary("test.mirror") diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index 89e0c1c6fccd..0880fb09941b 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) { "mirror.k8s.io/etcd:3.3.15-0", "mirror.k8s.io/pause:3.1", "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", }}, {"v1.15.0", "", []string{