Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 78a7905

Browse files
Kyle Hodgettsdavidmccormick
authored andcommitted
v0.12.x: Bump default Kubernetes Dashboard version and add AllowSkipLogin option (#1537)
* Bump default kubernetes dashboard version and introduce option to skip login
1 parent 8898234 commit 78a7905

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

core/controlplane/config/config.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ func NewDefaultCluster() *Cluster {
214214
KubernetesDashboard: KubernetesDashboard{
215215
AdminPrivileges: true,
216216
InsecureLogin: false,
217+
AllowSkipLogin: false,
217218
Enabled: true,
218219
},
219220
Kubernetes: Kubernetes{
@@ -252,7 +253,7 @@ func NewDefaultCluster() *Cluster {
252253
HeapsterImage: model.Image{Repo: "k8s.gcr.io/heapster", Tag: "v1.5.0", RktPullDocker: false},
253254
MetricsServerImage: model.Image{Repo: "k8s.gcr.io/metrics-server-amd64", Tag: "v0.2.1", RktPullDocker: false},
254255
AddonResizerImage: model.Image{Repo: "k8s.gcr.io/addon-resizer", Tag: "1.8.1", RktPullDocker: false},
255-
KubernetesDashboardImage: model.Image{Repo: "k8s.gcr.io/kubernetes-dashboard-amd64", Tag: "v1.8.3", RktPullDocker: false},
256+
KubernetesDashboardImage: model.Image{Repo: "k8s.gcr.io/kubernetes-dashboard-amd64", Tag: "v1.10.1", RktPullDocker: false},
256257
PauseImage: model.Image{Repo: "k8s.gcr.io/pause-amd64", Tag: "3.1", RktPullDocker: false},
257258
JournaldCloudWatchLogsImage: model.Image{Repo: "jollinshead/journald-cloudwatch-logs", Tag: "0.1", RktPullDocker: true},
258259
},
@@ -871,6 +872,7 @@ func (c *KubeDns) MergeIfEmpty(other KubeDns) {
871872
type KubernetesDashboard struct {
872873
AdminPrivileges bool `yaml:"adminPrivileges"`
873874
InsecureLogin bool `yaml:"insecureLogin"`
875+
AllowSkipLogin bool `yaml:"allowSkipLogin"`
874876
Enabled bool `yaml:"enabled"`
875877
ComputeResources ComputeResources `yaml:"resources,omitempty"`
876878
}

core/controlplane/config/templates/cloud-config-controller

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4244,6 +4244,9 @@ write_files:
42444244
{{ else }}
42454245
- --auto-generate-certificates
42464246
{{ end }}
4247+
{{ if .KubernetesDashboard.AllowSkipLogin }}
4248+
- --enable-skip-login
4249+
{{ end }}
42474250
resources:
42484251
requests:
42494252
cpu: {{ if .KubernetesDashboard.ComputeResources.Requests.Cpu }}{{ .KubernetesDashboard.ComputeResources.Requests.Cpu }}{{ else }}100m{{ end }}

core/root/config/templates/cluster.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ worker:
11441144
# Kube Dashboard image repository to use.
11451145
#kubernetesDashboardImage:
11461146
# repo: k8s.gcr.io/kubernetes-dashboard-amd64
1147-
# tag: v1.8.3
1147+
# tag: v1.10.1
11481148
# rktPullDocker: false
11491149

11501150
# Pause image repository to use.This works only if you are deploying your cluster in "cn-north-1" region.
@@ -1271,6 +1271,7 @@ kubeSystemNamespaceLabels:
12711271
kubernetesDashboard:
12721272
adminPrivileges: true
12731273
insecureLogin: false
1274+
allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+
12741275
enabled: true
12751276
# # Optional resource change for Dashboard can be done via using the resources block below and changing the values.
12761277
# # Values below are the default already if not set.

docs/advanced-topics/kubernetes-dashboard.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
kubernetesDashboard:
77
adminPrivileges: true
88
insecureLogin: false
9+
allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+
910
enabled: true
1011
resources:
1112
requests:
@@ -59,6 +60,7 @@ You can override these by changing the values as necessary.
5960
kubernetesDashboard:
6061
adminPrivileges: false
6162
insecureLogin: false
63+
allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+
6264
```
6365

6466
Ex.
@@ -90,6 +92,7 @@ spec:
9092
kubernetesDashboard:
9193
adminPrivileges: false
9294
insecureLogin: true
95+
allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+
9396
```
9497

9598
Ex.
@@ -126,6 +129,7 @@ spec:
126129
kubernetesDashboard:
127130
adminPrivileges: false
128131
insecureLogin: true
132+
allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+
129133
```
130134
Ex.
131135

0 commit comments

Comments
 (0)