diff --git a/builtin/files/cluster.yaml.tmpl b/builtin/files/cluster.yaml.tmpl index c41777121..90c38e699 100644 --- a/builtin/files/cluster.yaml.tmpl +++ b/builtin/files/cluster.yaml.tmpl @@ -1152,7 +1152,7 @@ worker: # Kube Dashboard image repository to use. #kubernetesDashboardImage: # repo: k8s.gcr.io/kubernetes-dashboard-amd64 -# tag: v1.8.3 +# tag: v1.10.1 # rktPullDocker: false # Pause image repository to use.This works only if you are deploying your cluster in "cn-north-1" region. @@ -1279,6 +1279,7 @@ kubeSystemNamespaceLabels: kubernetesDashboard: adminPrivileges: true insecureLogin: false + allowSkipLogin: false replicas: 1 enabled: true # # Optional resource change for Dashboard can be done via using the resources block below and changing the values. diff --git a/builtin/files/userdata/cloud-config-controller b/builtin/files/userdata/cloud-config-controller index d451d0aca..601db32dc 100644 --- a/builtin/files/userdata/cloud-config-controller +++ b/builtin/files/userdata/cloud-config-controller @@ -4327,6 +4327,9 @@ write_files: {{ else }} - --auto-generate-certificates {{ end }} + {{ if .KubernetesDashboard.AllowSkipLogin }} + - --enable-skip-login + {{ end }} resources: requests: cpu: {{ if .KubernetesDashboard.ComputeResources.Requests.Cpu }}{{ .KubernetesDashboard.ComputeResources.Requests.Cpu }}{{ else }}100m{{ end }} diff --git a/docs/advanced-topics/kubernetes-dashboard.md b/docs/advanced-topics/kubernetes-dashboard.md index 592aecd52..d9496865c 100644 --- a/docs/advanced-topics/kubernetes-dashboard.md +++ b/docs/advanced-topics/kubernetes-dashboard.md @@ -6,6 +6,7 @@ kubernetesDashboard: adminPrivileges: true insecureLogin: false + allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+ enabled: true replicas: 1 resources: @@ -60,6 +61,7 @@ You can override these by changing the values as necessary. kubernetesDashboard: adminPrivileges: false insecureLogin: false + allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+ ``` Ex. @@ -91,6 +93,7 @@ spec: kubernetesDashboard: adminPrivileges: false insecureLogin: true + allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+ ``` Ex. @@ -127,6 +130,7 @@ spec: kubernetesDashboard: adminPrivileges: false insecureLogin: true + allowSkipLogin: false # Only set to true when using dashboard image version v1.10.1+ ``` Ex. diff --git a/pkg/api/cluster.go b/pkg/api/cluster.go index 6dc99b733..b2f8c123c 100644 --- a/pkg/api/cluster.go +++ b/pkg/api/cluster.go @@ -189,6 +189,7 @@ func NewDefaultCluster() *Cluster { KubernetesDashboard: KubernetesDashboard{ AdminPrivileges: true, InsecureLogin: false, + AllowSkipLogin: false, Enabled: true, Replicas: 1, }, @@ -234,7 +235,7 @@ func NewDefaultCluster() *Cluster { HeapsterImage: Image{Repo: "k8s.gcr.io/heapster", Tag: "v1.5.0", RktPullDocker: false}, MetricsServerImage: Image{Repo: "k8s.gcr.io/metrics-server-amd64", Tag: "v0.2.1", RktPullDocker: false}, AddonResizerImage: Image{Repo: "k8s.gcr.io/addon-resizer", Tag: "1.8.1", RktPullDocker: false}, - KubernetesDashboardImage: Image{Repo: "k8s.gcr.io/kubernetes-dashboard-amd64", Tag: "v1.8.3", RktPullDocker: false}, + KubernetesDashboardImage: Image{Repo: "k8s.gcr.io/kubernetes-dashboard-amd64", Tag: "v1.10.1", RktPullDocker: false}, PauseImage: Image{Repo: "k8s.gcr.io/pause-amd64", Tag: "3.1", RktPullDocker: false}, JournaldCloudWatchLogsImage: Image{Repo: "jollinshead/journald-cloudwatch-logs", Tag: "0.1", RktPullDocker: true}, }, @@ -541,6 +542,7 @@ type Cluster struct { type KubernetesDashboard struct { AdminPrivileges bool `yaml:"adminPrivileges"` InsecureLogin bool `yaml:"insecureLogin"` + AllowSkipLogin bool `yaml:"allowSkipLogin"` Enabled bool `yaml:"enabled"` Replicas int `yaml:"replicas,omitempty"` ComputeResources ComputeResources `yaml:"resources,omitempty"`