kubeadm: gofmt'ed cmd/kubeadm.

cmd/kubeadm/app/apis/kubeadm/env.go

@@ -47,13 +47,13 @@ func SetEnvParams() *EnvParams {
 		}
 	}
 
-        return &EnvParams{
-                KubernetesDir:     envParams["kubernetes_dir"],
-                HostPKIPath:       envParams["host_pki_path"],
-                HostEtcdPath:      envParams["host_etcd_path"],
-                HyperkubeImage:    envParams["hyperkube_image"],
-                DiscoveryImage:    envParams["discovery_image"],
-                EtcdImage:         envParams["etcd_image"],
-                ComponentLoglevel: envParams["component_loglevel"],
-        }
+	return &EnvParams{
+		KubernetesDir:     envParams["kubernetes_dir"],
+		HostPKIPath:       envParams["host_pki_path"],
+		HostEtcdPath:      envParams["host_etcd_path"],
+		HyperkubeImage:    envParams["hyperkube_image"],
+		DiscoveryImage:    envParams["discovery_image"],
+		EtcdImage:         envParams["etcd_image"],
+		ComponentLoglevel: envParams["component_loglevel"],
+	}
 }

cmd/kubeadm/app/apis/kubeadm/types.go

@@ -19,13 +19,13 @@ package kubeadm
 import "k8s.io/kubernetes/pkg/api/unversioned"
 
 type EnvParams struct {
-        KubernetesDir     string
-        HostPKIPath       string
-        HostEtcdPath      string
-        HyperkubeImage    string
-        DiscoveryImage    string
-        EtcdImage         string
-        ComponentLoglevel string
+	KubernetesDir     string
+	HostPKIPath       string
+	HostEtcdPath      string
+	HyperkubeImage    string
+	DiscoveryImage    string
+	EtcdImage         string
+	ComponentLoglevel string
 }
 
 type MasterConfiguration struct {

cmd/kubeadm/app/master/addons.go

@@ -36,7 +36,7 @@ func createKubeProxyPodSpec(cfg *kubeadmapi.MasterConfiguration) api.PodSpec {
 		SecurityContext: &api.PodSecurityContext{HostNetwork: true},
 		Containers: []api.Container{{
 			Name:            kubeProxy,
-                        Image:           images.GetCoreImage(images.KubeProxyImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
+			Image:           images.GetCoreImage(images.KubeProxyImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
 			Command:         append(getProxyCommand(cfg), "--kubeconfig=/run/kubeconfig"),
 			SecurityContext: &api.SecurityContext{Privileged: &privilegedTrue},
 			VolumeMounts: []api.VolumeMount{
@@ -66,7 +66,7 @@ func createKubeProxyPodSpec(cfg *kubeadmapi.MasterConfiguration) api.PodSpec {
 			{
 				Name: "kubeconfig",
 				VolumeSource: api.VolumeSource{
-                                        HostPath: &api.HostPathVolumeSource{Path: path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "kubelet.conf")},
+					HostPath: &api.HostPathVolumeSource{Path: path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "kubelet.conf")},
 				},
 			},
 			{

cmd/kubeadm/app/master/discovery.go

@@ -69,7 +69,7 @@ func newKubeDiscoveryPodSpec(cfg *kubeadmapi.MasterConfiguration) api.PodSpec {
 		SecurityContext: &api.PodSecurityContext{HostNetwork: true},
 		Containers: []api.Container{{
 			Name:    kubeDiscoveryName,
-                        Image:   kubeadmapi.GlobalEnvParams.DiscoveryImage,
+			Image:   kubeadmapi.GlobalEnvParams.DiscoveryImage,
 			Command: []string{"/usr/local/bin/kube-discovery"},
 			VolumeMounts: []api.VolumeMount{{
 				Name:      kubeDiscoverySecretName,

cmd/kubeadm/app/master/manifests.go

@@ -58,7 +58,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 	staticPodSpecs := map[string]api.Pod{
 		kubeAPIServer: componentPod(api.Container{
 			Name:          kubeAPIServer,
-                        Image:         images.GetCoreImage(images.KubeAPIServerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
+			Image:         images.GetCoreImage(images.KubeAPIServerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
 			Command:       getAPIServerCommand(cfg),
 			VolumeMounts:  []api.VolumeMount{certsVolumeMount(), k8sVolumeMount()},
 			LivenessProbe: componentProbe(8080, "/healthz"),
@@ -66,7 +66,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 		}, certsVolume(cfg), k8sVolume(cfg)),
 		kubeControllerManager: componentPod(api.Container{
 			Name:          kubeControllerManager,
-                        Image:         images.GetCoreImage(images.KubeControllerManagerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
+			Image:         images.GetCoreImage(images.KubeControllerManagerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
 			Command:       getControllerManagerCommand(cfg),
 			VolumeMounts:  []api.VolumeMount{certsVolumeMount(), k8sVolumeMount()},
 			LivenessProbe: componentProbe(10252, "/healthz"),
@@ -74,7 +74,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 		}, certsVolume(cfg), k8sVolume(cfg)),
 		kubeScheduler: componentPod(api.Container{
 			Name:          kubeScheduler,
-                        Image:         images.GetCoreImage(images.KubeSchedulerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
+			Image:         images.GetCoreImage(images.KubeSchedulerImage, cfg, kubeadmapi.GlobalEnvParams.HyperkubeImage),
 			Command:       getSchedulerCommand(cfg),
 			LivenessProbe: componentProbe(10251, "/healthz"),
 			Resources:     componentResources("100m"),
@@ -92,7 +92,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 				"--data-dir=/var/etcd/data",
 			},
 			VolumeMounts:  []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(), k8sVolumeMount()},
-                        Image:         images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage),
+			Image:         images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage),
 			LivenessProbe: componentProbe(2379, "/health"),
 			Resources:     componentResources("200m"),
 			SecurityContext: &api.SecurityContext{
@@ -107,7 +107,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 		}, certsVolume(cfg), etcdVolume(cfg), k8sVolume(cfg))
 	}
 
-        manifestsPath := path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests")
+	manifestsPath := path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests")
 	if err := os.MkdirAll(manifestsPath, 0700); err != nil {
 		return fmt.Errorf("<master/manifests> failed to create directory %q [%v]", manifestsPath, err)
 	}
@@ -129,7 +129,7 @@ func etcdVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume {
 	return api.Volume{
 		Name: "etcd",
 		VolumeSource: api.VolumeSource{
-                        HostPath: &api.HostPathVolumeSource{Path: kubeadmapi.GlobalEnvParams.HostEtcdPath},
+			HostPath: &api.HostPathVolumeSource{Path: kubeadmapi.GlobalEnvParams.HostEtcdPath},
 		},
 	}
 }
@@ -163,7 +163,7 @@ func k8sVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume {
 	return api.Volume{
 		Name: "pki",
 		VolumeSource: api.VolumeSource{
-                        HostPath: &api.HostPathVolumeSource{Path: kubeadmapi.GlobalEnvParams.KubernetesDir},
+			HostPath: &api.HostPathVolumeSource{Path: kubeadmapi.GlobalEnvParams.KubernetesDir},
 		},
 	}
 }
@@ -219,12 +219,12 @@ func componentPod(container api.Container, volumes ...api.Volume) api.Pod {
 }
 
 func getComponentBaseCommand(component string) (command []string) {
-        if kubeadmapi.GlobalEnvParams.HyperkubeImage != "" {
+	if kubeadmapi.GlobalEnvParams.HyperkubeImage != "" {
 		command = []string{"/hyperkube", component}
 	} else {
 		command = []string{"kube-" + component}
 	}
-        command = append(command, kubeadmapi.GlobalEnvParams.ComponentLoglevel)
+	command = append(command, kubeadmapi.GlobalEnvParams.ComponentLoglevel)
 	return
 }
 

cmd/kubeadm/app/master/pki.go

@@ -158,7 +158,7 @@ func CreatePKIAssets(cfg *kubeadmapi.MasterConfiguration) (*rsa.PrivateKey, *x50
 	}
 	altNames.DNSNames = append(altNames.DNSNames, cfg.API.ExternalDNSNames...)
 
-        pkiPath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath)
+	pkiPath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath)
 
 	caKey, caCert, err := newCertificateAuthority()
 	if err != nil {

cmd/kubeadm/app/master/tokens.go

@@ -48,12 +48,12 @@ func generateTokenIfNeeded(s *kubeadmapi.Secrets) error {
 }
 
 func CreateTokenAuthFile(s *kubeadmapi.Secrets) error {
-        tokenAuthFilePath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath, "tokens.csv")
+	tokenAuthFilePath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath, "tokens.csv")
 	if err := generateTokenIfNeeded(s); err != nil {
 		return fmt.Errorf("<master/tokens> failed to generate token(s) [%v]", err)
 	}
-        if err := os.MkdirAll(kubeadmapi.GlobalEnvParams.HostPKIPath, 0700); err != nil {
-                return fmt.Errorf("<master/tokens> failed to create directory %q [%v]", kubeadmapi.GlobalEnvParams.HostPKIPath, err)
+	if err := os.MkdirAll(kubeadmapi.GlobalEnvParams.HostPKIPath, 0700); err != nil {
+		return fmt.Errorf("<master/tokens> failed to create directory %q [%v]", kubeadmapi.GlobalEnvParams.HostPKIPath, err)
 	}
 	serialized := []byte(fmt.Sprintf("%s,kubeadm-node-csr,%s,system:kubelet-bootstrap\n", s.BearerToken, uuid.NewUUID()))
 	// DumpReaderToFile create a file with mode 0600

cmd/kubeadm/app/util/error_test.go

@@ -17,36 +17,36 @@ limitations under the License.
 package util
 
 import (
-        "fmt"
-        "testing"
+	"fmt"
+	"testing"
 
-        "k8s.io/kubernetes/cmd/kubeadm/app/preflight"
+	"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
 )
 
 func TestCheckErr(t *testing.T) {
-        var codeReturned int
-        errHandle := func(err string, code int) {
-                codeReturned = code
-        }
-
-        var tokenTest = []struct {
-                e        error
-                expected int
-        }{
-                {nil, 0},
-                {fmt.Errorf(""), DefaultErrorExitCode},
-                {&preflight.PreFlightError{}, PreFlight},
-        }
-
-        for _, rt := range tokenTest {
-                codeReturned = 0
-                checkErr("", rt.e, errHandle)
-                if codeReturned != rt.expected {
-                        t.Errorf(
-                                "failed checkErr:\n\texpected: %d\n\t  actual: %d",
-                                rt.expected,
-                                codeReturned,
-                        )
-                }
-        }
+	var codeReturned int
+	errHandle := func(err string, code int) {
+		codeReturned = code
+	}
+
+	var tokenTest = []struct {
+		e        error
+		expected int
+	}{
+		{nil, 0},
+		{fmt.Errorf(""), DefaultErrorExitCode},
+		{&preflight.PreFlightError{}, PreFlight},
+	}
+
+	for _, rt := range tokenTest {
+		codeReturned = 0
+		checkErr("", rt.e, errHandle)
+		if codeReturned != rt.expected {
+			t.Errorf(
+				"failed checkErr:\n\texpected: %d\n\t  actual: %d",
+				rt.expected,
+				codeReturned,
+			)
+		}
+	}
 }

cmd/kubeadm/app/util/kubeconfig.go

@@ -76,11 +76,11 @@ func MakeClientConfigWithToken(config *clientcmdapi.Config, clusterName string,
 }
 
 func WriteKubeconfigIfNotExists(name string, kubeconfig *clientcmdapi.Config) error {
-        if err := os.MkdirAll(kubeadmapi.GlobalEnvParams.KubernetesDir, 0700); err != nil {
-                return fmt.Errorf("<util/kubeconfig> failed to create directory %q [%v]", kubeadmapi.GlobalEnvParams.KubernetesDir, err)
+	if err := os.MkdirAll(kubeadmapi.GlobalEnvParams.KubernetesDir, 0700); err != nil {
+		return fmt.Errorf("<util/kubeconfig> failed to create directory %q [%v]", kubeadmapi.GlobalEnvParams.KubernetesDir, err)
 	}
 
-        filename := path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, fmt.Sprintf("%s.conf", name))
+	filename := path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, fmt.Sprintf("%s.conf", name))
 	// Create and open the file, only if it does not already exist.
 	f, err := os.OpenFile(filename, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0600)
 	if err != nil {

cmd/kubeadm/app/util/tokens_test.go

@@ -18,7 +18,7 @@ package util
 
 import (
 	"bytes"
-        "strings"
+	"strings"
 	"testing"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
@@ -86,86 +86,86 @@ func newSecretsWithToken(token string) *kubeadmapi.Secrets {
 }
 
 func TestGenerateToken(t *testing.T) {
-        var genTest = []struct {
-                s kubeadmapi.Secrets
-                l int
-                n int
-        }{
-                {kubeadmapi.Secrets{}, 2, 6},
-        }
-
-        for _, rt := range genTest {
-                GenerateToken(&rt.s)
-                givenToken := strings.Split(strings.ToLower(rt.s.GivenToken), ".")
-                if len(givenToken) != rt.l {
-                        t.Errorf(
-                                "failed GenerateToken num parts:\n\texpected: %d\n\t  actual: %d",
-                                rt.l,
-                                len(givenToken),
-                        )
-                }
-                if len(givenToken[0]) != rt.n {
-                        t.Errorf(
-                                "failed GenerateToken first part length:\n\texpected: %d\n\t  actual: %d",
-                                rt.l,
-                                len(givenToken),
-                        )
-                }
-        }
+	var genTest = []struct {
+		s kubeadmapi.Secrets
+		l int
+		n int
+	}{
+		{kubeadmapi.Secrets{}, 2, 6},
+	}
+
+	for _, rt := range genTest {
+		GenerateToken(&rt.s)
+		givenToken := strings.Split(strings.ToLower(rt.s.GivenToken), ".")
+		if len(givenToken) != rt.l {
+			t.Errorf(
+				"failed GenerateToken num parts:\n\texpected: %d\n\t  actual: %d",
+				rt.l,
+				len(givenToken),
+			)
+		}
+		if len(givenToken[0]) != rt.n {
+			t.Errorf(
+				"failed GenerateToken first part length:\n\texpected: %d\n\t  actual: %d",
+				rt.l,
+				len(givenToken),
+			)
+		}
+	}
 }
 
 func TestUseGivenTokenIfValid(t *testing.T) {
-        var tokenTest = []struct {
-                s        kubeadmapi.Secrets
-                expected bool
-        }{
-                {kubeadmapi.Secrets{GivenToken: ""}, false},         // GivenToken == ""
-                {kubeadmapi.Secrets{GivenToken: "noperiod"}, false}, // not 2-part '.' format
-                {kubeadmapi.Secrets{GivenToken: "abcd.a"}, false},   // len(tokenID) != 6
-                {kubeadmapi.Secrets{GivenToken: "abcdef.a"}, true},
-        }
-
-        for _, rt := range tokenTest {
-                actual, _ := UseGivenTokenIfValid(&rt.s)
-                if actual != rt.expected {
-                        t.Errorf(
-                                "failed UseGivenTokenIfValid:\n\texpected: %t\n\t  actual: %t\n\t token:%s",
-                                rt.expected,
-                                actual,
-                                rt.s.GivenToken,
-                        )
-                }
-        }
+	var tokenTest = []struct {
+		s        kubeadmapi.Secrets
+		expected bool
+	}{
+		{kubeadmapi.Secrets{GivenToken: ""}, false},         // GivenToken == ""
+		{kubeadmapi.Secrets{GivenToken: "noperiod"}, false}, // not 2-part '.' format
+		{kubeadmapi.Secrets{GivenToken: "abcd.a"}, false},   // len(tokenID) != 6
+		{kubeadmapi.Secrets{GivenToken: "abcdef.a"}, true},
+	}
+
+	for _, rt := range tokenTest {
+		actual, _ := UseGivenTokenIfValid(&rt.s)
+		if actual != rt.expected {
+			t.Errorf(
+				"failed UseGivenTokenIfValid:\n\texpected: %t\n\t  actual: %t\n\t token:%s",
+				rt.expected,
+				actual,
+				rt.s.GivenToken,
+			)
+		}
+	}
 }
 
 func TestRandBytes(t *testing.T) {
-        var randTest = []struct {
-                r        int
-                l        int
-                expected error
-        }{
-                {0, 0, nil},
-                {1, 1, nil},
-                {2, 2, nil},
-                {3, 3, nil},
-                {100, 100, nil},
-        }
-
-        for _, rt := range randTest {
-                actual, _, err := RandBytes(rt.r)
-                if err != rt.expected {
-                        t.Errorf(
-                                "failed RandBytes:\n\texpected: %s\n\t  actual: %s",
-                                rt.expected,
-                                err,
-                        )
-                }
-                if len(actual) != rt.l {
-                        t.Errorf(
-                                "failed RandBytes:\n\texpected: %d\n\t  actual: %d\n",
-                                rt.l,
-                                len(actual),
-                        )
-                }
-        }
+	var randTest = []struct {
+		r        int
+		l        int
+		expected error
+	}{
+		{0, 0, nil},
+		{1, 1, nil},
+		{2, 2, nil},
+		{3, 3, nil},
+		{100, 100, nil},
+	}
+
+	for _, rt := range randTest {
+		actual, _, err := RandBytes(rt.r)
+		if err != rt.expected {
+			t.Errorf(
+				"failed RandBytes:\n\texpected: %s\n\t  actual: %s",
+				rt.expected,
+				err,
+			)
+		}
+		if len(actual) != rt.l {
+			t.Errorf(
+				"failed RandBytes:\n\texpected: %d\n\t  actual: %d\n",
+				rt.l,
+				len(actual),
+			)
+		}
+	}
 }