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

Master: Bump default Kubernetes Dashboard version and add AllowSkipLogin option #1536

Merged
merged 5 commits into from
Jan 17, 2019
Merged

Master: Bump default Kubernetes Dashboard version and add AllowSkipLogin option #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf90af1
Merge pull request #11 from HotelsDotCom/update-master
Jan 15, 2019
220cbf8
Bump default kubernetes dashboard version and introduce option to ski…
Jan 15, 2019
0d61cea
rename allowSkip to allowSkipLogin
Jan 15, 2019
6573931
update docs
Jan 16, 2019
f70b55f
Merge branch 'master' into update-k8s-dashboard-master
davidmccormick Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion builtin/files/cluster.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions builtin/files/userdata/cloud-config-controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 4 additions & 0 deletions docs/advanced-topics/kubernetes-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down
4 changes: 3 additions & 1 deletion pkg/api/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ func NewDefaultCluster() *Cluster {
KubernetesDashboard: KubernetesDashboard{
AdminPrivileges: true,
InsecureLogin: false,
AllowSkipLogin: false,
Enabled: true,
Replicas: 1,
},
Expand Down Expand Up @@ -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},
},
Expand Down Expand Up @@ -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"`
Expand Down