github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix sorting of linted packages and gofmt

pull/6/head
Ilya Dmitrichenko 2016-09-23 18:35:17 +01:00
parent 37dab80173
commit d0e29789b0
No known key found for this signature in database
GPG Key ID: E7889175A6C0CEB9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubeadm/app/master/manifests.go
View File

@ -220,7 +220,7 @@ func componentPod(container api.Container, volumes ...api.Volume) api.Pod {
func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command []string) { func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command []string) {
baseFlags := map[string][]string{ baseFlags := map[string][]string{
apiServer: []string{ apiServer: {
"--address=127.0.0.1", "--address=127.0.0.1",
"--etcd-servers=http://127.0.0.1:2379", "--etcd-servers=http://127.0.0.1:2379",
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota", "--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota",
@ -233,7 +233,7 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
"--secure-port=443", "--secure-port=443",
"--allow-privileged", "--allow-privileged",
}, },
controllerManager: []string{ controllerManager: {
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the cm port to the rest of the world // TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the cm port to the rest of the world
"--leader-elect", "--leader-elect",
"--master=127.0.0.1:8080", "--master=127.0.0.1:8080",
@ -244,12 +244,12 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
"--cluster-signing-key-file=" + pkiDir + "/ca-key.pem", "--cluster-signing-key-file=" + pkiDir + "/ca-key.pem",
"--insecure-experimental-approve-all-kubelet-csrs-for-group=system:kubelet-bootstrap", "--insecure-experimental-approve-all-kubelet-csrs-for-group=system:kubelet-bootstrap",
}, },
scheduler: []string{ scheduler: {
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the scheduler port to the rest of the world // TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the scheduler port to the rest of the world
"--leader-elect", "--leader-elect",
"--master=127.0.0.1:8080", "--master=127.0.0.1:8080",
}, },
proxy: []string{}, proxy: {},
} }
if s.EnvParams["hyperkube_image"] != "" { if s.EnvParams["hyperkube_image"] != "" {

2
hack/.linted_packages
View File

@ -15,6 +15,7 @@ cmd/kube-discovery
cmd/kube-dns cmd/kube-dns
cmd/kube-proxy cmd/kube-proxy
cmd/kubeadm cmd/kubeadm
cmd/kubeadm
cmd/kubectl cmd/kubectl
cmd/kubelet cmd/kubelet
cmd/kubernetes-discovery cmd/kubernetes-discovery
@ -243,4 +244,3 @@ test/integration/openshift
test/soak/cauldron test/soak/cauldron
test/soak/serve_hostnames test/soak/serve_hostnames
third_party/forked/golang/expansion third_party/forked/golang/expansion
cmd/kubeadm