From 2da74f03501074d719bb1457c0f0b02b26804ce1 Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Thu, 28 May 2020 11:45:00 +0200 Subject: [PATCH 1/5] Bump Dashboard to v2.0.1 --- deploy/addons/dashboard/dashboard-dp.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/addons/dashboard/dashboard-dp.yaml b/deploy/addons/dashboard/dashboard-dp.yaml index fae011b402b0..aec28edf6367 100644 --- a/deploy/addons/dashboard/dashboard-dp.yaml +++ b/deploy/addons/dashboard/dashboard-dp.yaml @@ -36,7 +36,7 @@ spec: spec: containers: - name: dashboard-metrics-scraper - image: kubernetesui/metrics-scraper:v1.0.2 + image: kubernetesui/metrics-scraper:v1.0.4 ports: - containerPort: 8000 protocol: TCP @@ -73,7 +73,7 @@ metadata: labels: k8s-app: kubernetes-dashboard kubernetes.io/minikube-addons: dashboard - addonmanager.kubernetes.io/mode: Reconcile + addonmanager.kubernetes.io/mode: Reconcile name: kubernetes-dashboard namespace: kubernetes-dashboard spec: @@ -90,7 +90,7 @@ spec: containers: - name: kubernetes-dashboard # WARNING: This must match pkg/minikube/bootstrapper/images/images.go - image: kubernetesui/dashboard:v2.0.0 + image: kubernetesui/dashboard:v2.0.1 ports: - containerPort: 9090 protocol: TCP From 57c634098287188147f7433c6f34b861e58864fb Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Thu, 4 Jun 2020 09:08:05 +0200 Subject: [PATCH 2/5] Update dashboardFrontend and dashboardMetrics functions --- pkg/minikube/bootstrapper/images/images.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index addc83baa89e..07f74afc01b5 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -135,7 +135,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.0") + return path.Join(repo, "dashboard:v2.0.1") } // dashboardMetrics returns the image used for the dashboard metrics scraper @@ -144,5 +144,5 @@ func dashboardMetrics(repo string) string { repo = "kubernetesui" } // See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml - return path.Join(repo, "metrics-scraper:v1.0.2") + return path.Join(repo, "metrics-scraper:v1.0.4") } From 5f6391783a5e60c24651294df46f2e35c2423860 Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Thu, 4 Jun 2020 09:20:32 +0200 Subject: [PATCH 3/5] Update versions in the other files --- .../bootstrapper/images/kubeadm_test.go | 20 +++++++++---------- pkg/minikube/cruntime/containerd_test.go | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index 169d68d49057..daeeea42913e 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -38,8 +38,8 @@ 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:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.16.1", "mirror.k8s.io", []string{ "mirror.k8s.io/kube-proxy:v1.16.1", @@ -62,8 +62,8 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.14.0", "", []string{ "k8s.gcr.io/kube-proxy:v1.14.0", @@ -74,8 +74,8 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.13.0", "", []string{ "k8s.gcr.io/kube-proxy:v1.13.0", @@ -86,8 +86,8 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.12.0", "", []string{ "k8s.gcr.io/kube-proxy:v1.12.0", @@ -98,8 +98,8 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", }}, } for _, tc := range tests { diff --git a/pkg/minikube/cruntime/containerd_test.go b/pkg/minikube/cruntime/containerd_test.go index cfb1e55f6706..5f99033daa74 100644 --- a/pkg/minikube/cruntime/containerd_test.go +++ b/pkg/minikube/cruntime/containerd_test.go @@ -25,8 +25,8 @@ func TestAddRepoTagToImageName(t *testing.T) { imgName string want string }{ - {"kubernetesui/dashboard:v2.0.0-rc6", "docker.io/kubernetesui/dashboard:v2.0.0-rc6"}, - {"kubernetesui/metrics-scraper:v1.0.2", "docker.io/kubernetesui/metrics-scraper:v1.0.2"}, + {"kubernetesui/dashboard:v2.0.1", "docker.io/kubernetesui/dashboard:v2.0.1"}, + {"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"}, {"gcr.io/k8s-minikube/storage-provisioner:v1.8.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1"}, } for _, tc := range tests { From 424e15885662ead21933904d3d795e8f7bbe47de Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Wed, 10 Jun 2020 10:41:19 +0200 Subject: [PATCH 4/5] Fix unit tests --- pkg/minikube/bootstrapper/images/images_test.go | 8 ++++---- pkg/minikube/bootstrapper/images/kubeadm_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index ff5de65c416e..657d43a51c7f 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -25,8 +25,8 @@ import ( func TestAuxiliary(t *testing.T) { want := []string{ "gcr.io/k8s-minikube/storage-provisioner:v1.8.1", - "kubernetesui/dashboard:v2.0.0", - "kubernetesui/metrics-scraper:v1.0.2", + "kubernetesui/dashboard:v2.0.1", + "kubernetesui/metrics-scraper:v1.0.4", } got := auxiliary("") if diff := cmp.Diff(want, got); diff != "" { @@ -37,8 +37,8 @@ func TestAuxiliary(t *testing.T) { func TestAuxiliaryMirror(t *testing.T) { want := []string{ "test.mirror/storage-provisioner:v1.8.1", - "test.mirror/dashboard:v2.0.0", - "test.mirror/metrics-scraper:v1.0.2", + "test.mirror/dashboard:v2.0.1", + "test.mirror/metrics-scraper:v1.0.4", } got := auxiliary("test.mirror") if diff := cmp.Diff(want, got); diff != "" { diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index daeeea42913e..d95ca2fd45ec 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -50,8 +50,8 @@ func TestKubeadmImages(t *testing.T) { "mirror.k8s.io/etcd:3.3.15-0", "mirror.k8s.io/pause:3.1", "mirror.k8s.io/storage-provisioner:v1.8.1", - "mirror.k8s.io/dashboard:v2.0.0", - "mirror.k8s.io/metrics-scraper:v1.0.2", + "mirror.k8s.io/dashboard:v2.0.1", + "mirror.k8s.io/metrics-scraper:v1.0.4", }}, {"v1.15.0", "", []string{ "k8s.gcr.io/kube-proxy:v1.15.0", From d02b4b0df45ed6a2b404f6b87680c66aef0d1939 Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Thu, 18 Jun 2020 10:37:40 +0200 Subject: [PATCH 5/5] Bump preload version --- pkg/minikube/download/preload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go index 2d9a0a913336..cf8b97d94b72 100644 --- a/pkg/minikube/download/preload.go +++ b/pkg/minikube/download/preload.go @@ -40,7 +40,7 @@ const ( // PreloadVersion is the current version of the preloaded tarball // // NOTE: You may need to bump this version up when upgrading auxiliary docker images - PreloadVersion = "v3" + PreloadVersion = "v4" // PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist PreloadBucket = "minikube-preloaded-volume-tarballs" )