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

Merge pull request #12475 from leifcr/patch-2 

Use newer dashboard, to support ingress extensions
pull/12496/head
Sharif Elgamal 2021-09-16 13:31:51 -07:00 committed by GitHub
parent 4607e391af 61432f72a3
commit a86693c96e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,8 +134,8 @@ var Addons = map[string]*Addon{
MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), 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"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"),
}, false, "dashboard", "kubernetes", map[string]string{ }, false, "dashboard", "kubernetes", map[string]string{
"Dashboard": "kubernetesui/dashboard:v2.1.0@sha256:7f80b5ba141bead69c4fee8661464857af300d7d7ed0274cf7beecedc00322e6", "Dashboard": "kubernetesui/dashboard:v2.3.1@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.4@sha256:555981a24f184420f3be0c79d4efb6c948a85cfce84034f85a563f4151a81cbf", "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.7@sha256:ec27f462cf1946220f5a9ace416a84a57c18f98c777876a8054405d1428cc92e",
}, nil), }, nil),
"default-storageclass": NewAddon([]*BinAsset{ "default-storageclass": NewAddon([]*BinAsset{
MustBinAsset(addons.DefaultStorageClassAssets, MustBinAsset(addons.DefaultStorageClassAssets,

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

@ -146,7 +146,7 @@ func dashboardFrontend(repo string) string {
repo = "docker.io" repo = "docker.io"
} }
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml // See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
return path.Join(repo, "kubernetesui", "dashboard:v2.1.0") return path.Join(repo, "kubernetesui", "dashboard:v2.3.1")
} }
// dashboardMetrics returns the image used for the dashboard metrics scraper // dashboardMetrics returns the image used for the dashboard metrics scraper
@ -155,7 +155,7 @@ func dashboardMetrics(repo string) string {
repo = "docker.io" repo = "docker.io"
} }
// See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml // See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml
return path.Join(repo, "kubernetesui", "metrics-scraper:v1.0.4") return path.Join(repo, "kubernetesui", "metrics-scraper:v1.0.7")
} }
// KindNet returns the image used for kindnet // KindNet returns the image used for kindnet

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

@ -94,8 +94,8 @@ k8s.gcr.io/coredns/coredns:v1.8.4
func TestAuxiliary(t *testing.T) { func TestAuxiliary(t *testing.T) {
want := []string{ want := []string{
"gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
} }
got := auxiliary("") got := auxiliary("")
if diff := cmp.Diff(want, got); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
@ -106,8 +106,8 @@ func TestAuxiliary(t *testing.T) {
func TestAuxiliaryMirror(t *testing.T) { func TestAuxiliaryMirror(t *testing.T) {
want := []string{ want := []string{
"test.mirror/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), "test.mirror/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"test.mirror/kubernetesui/dashboard:v2.1.0", "test.mirror/kubernetesui/dashboard:v2.3.1",
"test.mirror/kubernetesui/metrics-scraper:v1.0.4", "test.mirror/kubernetesui/metrics-scraper:v1.0.7",
} }
got := auxiliary("test.mirror") got := auxiliary("test.mirror")
if diff := cmp.Diff(want, got); diff != "" { if diff := cmp.Diff(want, got); diff != "" {

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

@ -43,8 +43,8 @@ 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:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.16.1", "mirror.k8s.io", false, []string{ {"v1.16.1", "mirror.k8s.io", false, []string{
"mirror.k8s.io/kube-proxy:v1.16.1", "mirror.k8s.io/kube-proxy:v1.16.1",
@ -55,8 +55,8 @@ 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/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), "mirror.k8s.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"mirror.k8s.io/kubernetesui/dashboard:v2.1.0", "mirror.k8s.io/kubernetesui/dashboard:v2.3.1",
"mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.4", "mirror.k8s.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.15.0", "", false, []string{ {"v1.15.0", "", false, []string{
"k8s.gcr.io/kube-proxy:v1.15.0", "k8s.gcr.io/kube-proxy:v1.15.0",
@ -67,8 +67,8 @@ 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:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.14.0", "", false, []string{ {"v1.14.0", "", false, []string{
"k8s.gcr.io/kube-proxy:v1.14.0", "k8s.gcr.io/kube-proxy:v1.14.0",
@ -79,8 +79,8 @@ 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:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.13.0", "", false, []string{ {"v1.13.0", "", false, []string{
"k8s.gcr.io/kube-proxy:v1.13.0", "k8s.gcr.io/kube-proxy:v1.13.0",
@ -91,8 +91,8 @@ 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:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.12.0", "", false, []string{ {"v1.12.0", "", false, []string{
"k8s.gcr.io/kube-proxy:v1.12.0", "k8s.gcr.io/kube-proxy:v1.12.0",
@ -103,8 +103,8 @@ 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:" + version.GetStorageProvisionerVersion(), "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(),
"docker.io/kubernetesui/dashboard:v2.1.0", "docker.io/kubernetesui/dashboard:v2.3.1",
"docker.io/kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.7",
}}, }},
{"v1.11.0", "", true, nil}, {"v1.11.0", "", true, nil},
{"v1.10.0", "", true, nil}, {"v1.10.0", "", true, nil},

2
pkg/minikube/download/preload.go
View File

@ -43,7 +43,7 @@ const (
// PreloadVersion is the current version of the preloaded tarball // PreloadVersion is the current version of the preloaded tarball
// //
// NOTE: You may need to bump this version up when upgrading auxiliary docker images // NOTE: You may need to bump this version up when upgrading auxiliary docker images
PreloadVersion = "v12" PreloadVersion = "v13"
// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist // PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
PreloadBucket = "minikube-preloaded-volume-tarballs" PreloadBucket = "minikube-preloaded-volume-tarballs"
) )