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

Merge pull request #508 from justinsb/revert_507 

Revert AdmissionControl change in 507
This commit is contained in:
Justin Santa Barbara 2016-09-24 18:12:48 -04:00 committed by GitHub
parent 37fce2bcb8 6aca5b4f24
commit 030f0c45f5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/api/componentconfig.go
View File

@ -359,7 +359,7 @@ type KubeAPIServerConfig struct {
Address string `json:"address,omitempty" flag:"address"` Address string `json:"address,omitempty" flag:"address"`
EtcdServers string `json:"etcdServers,omitempty" flag:"etcd-servers"` EtcdServers string `json:"etcdServers,omitempty" flag:"etcd-servers"`
EtcdServersOverrides string `json:"etcdServersOverrides,omitempty" flag:"etcd-servers-overrides"` EtcdServersOverrides string `json:"etcdServersOverrides,omitempty" flag:"etcd-servers-overrides"`
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"` AdmissionControl string `json:"admissionControl,omitempty" flag:"admission-control"`
ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"` ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"`
ClientCAFile string `json:"clientCAFile,omitempty" flag:"client-ca-file"` ClientCAFile string `json:"clientCAFile,omitempty" flag:"client-ca-file"`
BasicAuthFile string `json:"basicAuthFile,omitempty" flag:"basic-auth-file"` BasicAuthFile string `json:"basicAuthFile,omitempty" flag:"basic-auth-file"`