Merge pull request #69386 from cblecker/go-1.11

build/build-image/cross/Dockerfile

@@ -15,7 +15,7 @@
 # This file creates a standard build environment for building cross
 # platform go binary for the architecture kubernetes cares about.
 
-FROM golang:1.10.4
+FROM golang:1.11.1
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \

build/build-image/cross/VERSION

-v1.10.4-1
+v1.11.1-1

build/root/WORKSPACE

@@ -3,15 +3,15 @@ load("//build:workspace.bzl", "CRI_TOOLS_VERSION")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "97cf62bdef33519412167fd1e4b0810a318a7c234f5f8dc4f53e2da86241c492",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.15.3/rules_go-0.15.3.tar.gz"),
+    sha256 = "7519e9e1c716ae3c05bd2d984a42c3b02e690c5df728dc0a84b23f90c355c5a1",
+    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.15.4/rules_go-0.15.4.tar.gz"),
 )
 
 http_archive(
     name = "io_kubernetes_build",
-    sha256 = "1188feb932cefad328b0a3dd75b3ebd1d79dd26dbdd723f019ceb760e27ba6d8",
-    strip_prefix = "repo-infra-84d52408a061e87d45aebf5a0867246bdf66d180",
-    urls = mirror("https://github.com/kubernetes/repo-infra/archive/84d52408a061e87d45aebf5a0867246bdf66d180.tar.gz"),
+    sha256 = "66a44fd5f6357268340d66fbd8a502065445a7c022732fe5f6fd84d9a20f75a3",
+    strip_prefix = "repo-infra-e8f2f7c3decf03e1fde9f30d249e39b8328aa8b0",
+    urls = mirror("https://github.com/kubernetes/repo-infra/archive/e8f2f7c3decf03e1fde9f30d249e39b8328aa8b0.tar.gz"),
 )
 
 http_archive(
@@ -48,7 +48,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.10.4",
+    go_version = "1.11.1",
 )
 
 docker_repositories()

cluster/gce/gci/apiserver_manifest_test.go

@@ -105,12 +105,12 @@ func TestEncryptionProviderFlag(t *testing.T) {
 		wantFlag                 bool
 	}{
 		{
-			desc: "ENCRYPTION_PROVIDER_CONFIG is set",
+			desc:                     "ENCRYPTION_PROVIDER_CONFIG is set",
 			encryptionProviderConfig: base64.StdEncoding.EncodeToString([]byte("foo")),
 			wantFlag:                 true,
 		},
 		{
-			desc: "ENCRYPTION_PROVIDER_CONFIG is not set",
+			desc:                     "ENCRYPTION_PROVIDER_CONFIG is not set",
 			encryptionProviderConfig: "",
 			wantFlag:                 false,
 		},

cluster/images/etcd/migrate/integration_test.go

@@ -323,7 +323,7 @@ func generateSelfSignedCertKey(host string, alternateIPs []net.IP, alternateDNS
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 
 	if ip := net.ParseIP(host); ip != nil {

cmd/cloud-controller-manager/app/options/options_test.go

@@ -104,8 +104,8 @@ func TestDefaultFlags(t *testing.T) {
 			RemoteKubeConfigFileOptional: true,
 			AlwaysAllowPaths:             []string{"/healthz"}, // note: this does not match /healthz/ or
 		},
-		Kubeconfig: "",
-		Master:     "",
+		Kubeconfig:                "",
+		Master:                    "",
 		NodeStatusUpdateFrequency: metav1.Duration{Duration: 5 * time.Minute},
 	}
 	if !reflect.DeepEqual(expected, s) {
@@ -222,8 +222,8 @@ func TestAddFlags(t *testing.T) {
 			RemoteKubeConfigFileOptional: true,
 			AlwaysAllowPaths:             []string{"/healthz"}, // note: this does not match /healthz/ or
 		},
-		Kubeconfig: "/kubeconfig",
-		Master:     "192.168.4.20",
+		Kubeconfig:                "/kubeconfig",
+		Master:                    "192.168.4.20",
 		NodeStatusUpdateFrequency: metav1.Duration{Duration: 10 * time.Minute},
 	}
 	if !reflect.DeepEqual(expected, s) {

cmd/kube-apiserver/app/options/options.go

@@ -77,17 +77,17 @@ type ServerRunOptions struct {
 func NewServerRunOptions() *ServerRunOptions {
 	s := ServerRunOptions{
 		GenericServerRunOptions: genericoptions.NewServerRunOptions(),
-		Etcd:                 genericoptions.NewEtcdOptions(storagebackend.NewDefaultConfig(kubeoptions.DefaultEtcdPathPrefix, nil)),
-		SecureServing:        kubeoptions.NewSecureServingOptions(),
-		InsecureServing:      kubeoptions.NewInsecureServingOptions(),
-		Audit:                genericoptions.NewAuditOptions(),
-		Features:             genericoptions.NewFeatureOptions(),
-		Admission:            kubeoptions.NewAdmissionOptions(),
-		Authentication:       kubeoptions.NewBuiltInAuthenticationOptions().WithAll(),
-		Authorization:        kubeoptions.NewBuiltInAuthorizationOptions(),
-		CloudProvider:        kubeoptions.NewCloudProviderOptions(),
-		StorageSerialization: kubeoptions.NewStorageSerializationOptions(),
-		APIEnablement:        genericoptions.NewAPIEnablementOptions(),
+		Etcd:                    genericoptions.NewEtcdOptions(storagebackend.NewDefaultConfig(kubeoptions.DefaultEtcdPathPrefix, nil)),
+		SecureServing:           kubeoptions.NewSecureServingOptions(),
+		InsecureServing:         kubeoptions.NewInsecureServingOptions(),
+		Audit:                   genericoptions.NewAuditOptions(),
+		Features:                genericoptions.NewFeatureOptions(),
+		Admission:               kubeoptions.NewAdmissionOptions(),
+		Authentication:          kubeoptions.NewBuiltInAuthenticationOptions().WithAll(),
+		Authorization:           kubeoptions.NewBuiltInAuthorizationOptions(),
+		CloudProvider:           kubeoptions.NewCloudProviderOptions(),
+		StorageSerialization:    kubeoptions.NewStorageSerializationOptions(),
+		APIEnablement:           genericoptions.NewAPIEnablementOptions(),
 
 		EnableLogsHandler:      true,
 		EventTTL:               1 * time.Hour,

cmd/kube-apiserver/app/options/options_test.go

@@ -142,16 +142,16 @@ func TestAddFlags(t *testing.T) {
 		},
 		Etcd: &apiserveroptions.EtcdOptions{
 			StorageConfig: storagebackend.Config{
-				Type:       "etcd2",
-				ServerList: nil,
-				Prefix:     "/registry",
+				Type:                     "etcd2",
+				ServerList:               nil,
+				Prefix:                   "/registry",
 				DeserializationCacheSize: 0,
-				Quorum:                false,
-				KeyFile:               "/var/run/kubernetes/etcd.key",
-				CAFile:                "/var/run/kubernetes/etcdca.crt",
-				CertFile:              "/var/run/kubernetes/etcdce.crt",
-				CompactionInterval:    storagebackend.DefaultCompactInterval,
-				CountMetricPollPeriod: time.Minute,
+				Quorum:                   false,
+				KeyFile:                  "/var/run/kubernetes/etcd.key",
+				CAFile:                   "/var/run/kubernetes/etcdca.crt",
+				CertFile:                 "/var/run/kubernetes/etcdce.crt",
+				CompactionInterval:       storagebackend.DefaultCompactInterval,
+				CountMetricPollPeriod:    time.Minute,
 			},
 			DefaultStorageMediaType: "application/vnd.kubernetes.protobuf",
 			DeleteCollectionWorkers: 1,

cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go

@@ -448,9 +448,9 @@ func TestValidateInitConfiguration(t *testing.T) {
 								MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 							},
 							Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-								Max:        utilpointer.Int32Ptr(2),
-								MaxPerCore: utilpointer.Int32Ptr(1),
-								Min:        utilpointer.Int32Ptr(1),
+								Max:                   utilpointer.Int32Ptr(2),
+								MaxPerCore:            utilpointer.Int32Ptr(1),
+								Min:                   utilpointer.Int32Ptr(1),
 								TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 								TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 							},
@@ -495,9 +495,9 @@ func TestValidateInitConfiguration(t *testing.T) {
 								MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 							},
 							Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-								Max:        utilpointer.Int32Ptr(2),
-								MaxPerCore: utilpointer.Int32Ptr(1),
-								Min:        utilpointer.Int32Ptr(1),
+								Max:                   utilpointer.Int32Ptr(2),
+								MaxPerCore:            utilpointer.Int32Ptr(1),
+								Min:                   utilpointer.Int32Ptr(1),
 								TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 								TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 							},

cmd/kubeadm/app/cmd/config.go

@@ -195,7 +195,7 @@ func getDefaultInitConfigBytes(kind string) ([]byte, error) {
 
 func getDefaultNodeConfigBytes() ([]byte, error) {
 	internalcfg, err := configutil.NodeConfigFileAndDefaultsToInternalConfig("", &kubeadmapiv1beta1.JoinConfiguration{
-		Token: sillyToken.Token.String(),
+		Token:                                  sillyToken.Token.String(),
 		DiscoveryTokenAPIServers:               []string{"kube-apiserver:6443"},
 		DiscoveryTokenUnsafeSkipCAVerification: true, // TODO: DiscoveryTokenUnsafeSkipCAVerification: true needs to be set for validation to pass, but shouldn't be recommended as the default
 	})

cmd/kubeadm/app/cmd/token.go

@@ -97,9 +97,9 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command {
 	bto := options.NewBootstrapTokenOptions()
 
 	createCmd := &cobra.Command{
-		Use: "create [token]",
+		Use:                   "create [token]",
 		DisableFlagsInUseLine: true,
-		Short: "Create bootstrap tokens on the server.",
+		Short:                 "Create bootstrap tokens on the server.",
 		Long: dedent.Dedent(`
 			This command will create a bootstrap token for you.
 			You can specify the usages for this token, the "time to live" and an optional human friendly description.
@@ -158,9 +158,9 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command {
 	tokenCmd.AddCommand(listCmd)
 
 	deleteCmd := &cobra.Command{
-		Use: "delete [token-value]",
+		Use:                   "delete [token-value]",
 		DisableFlagsInUseLine: true,
-		Short: "Delete bootstrap tokens on the server.",
+		Short:                 "Delete bootstrap tokens on the server.",
 		Long: dedent.Dedent(`
 			This command will delete a given bootstrap token for you.
 

cmd/kubeadm/app/cmd/upgrade/apply.go

@@ -74,9 +74,9 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use: "apply [version]",
+		Use:                   "apply [version]",
 		DisableFlagsInUseLine: true,
-		Short: "Upgrade your Kubernetes cluster to the specified version.",
+		Short:                 "Upgrade your Kubernetes cluster to the specified version.",
 		Run: func(cmd *cobra.Command, args []string) {
 			var err error
 			flags.ignorePreflightErrorsSet, err = validation.ValidateIgnorePreflightErrors(flags.ignorePreflightErrors)

cmd/kubeadm/app/cmd/upgrade/upgrade.go

@@ -53,7 +53,7 @@ func NewCmdUpgrade(out io.Writer) *cobra.Command {
 		allowRCUpgrades:           false,
 		printConfig:               false,
 		ignorePreflightErrorsSet:  sets.NewString(),
-		out: out,
+		out:                       out,
 	}
 
 	cmd := &cobra.Command{

cmd/kubeadm/app/componentconfigs/validation_test.go

@@ -55,9 +55,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -87,9 +87,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -120,9 +120,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -153,9 +153,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -186,9 +186,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -219,9 +219,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},
@@ -252,9 +252,9 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 							MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},
 						},
 						Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-							Max:        utilpointer.Int32Ptr(2),
-							MaxPerCore: utilpointer.Int32Ptr(1),
-							Min:        utilpointer.Int32Ptr(1),
+							Max:                   utilpointer.Int32Ptr(2),
+							MaxPerCore:            utilpointer.Int32Ptr(1),
+							Min:                   utilpointer.Int32Ptr(1),
 							TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 							TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 						},

cmd/kubeadm/app/phases/addons/proxy/proxy_test.go

@@ -210,9 +210,9 @@ func TestEnsureProxyAddon(t *testing.T) {
 			HealthzBindAddress: "0.0.0.0:10256",
 			MetricsBindAddress: "127.0.0.1:10249",
 			Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
-				Max:        pointer.Int32Ptr(2),
-				MaxPerCore: pointer.Int32Ptr(1),
-				Min:        pointer.Int32Ptr(1),
+				Max:                   pointer.Int32Ptr(2),
+				MaxPerCore:            pointer.Int32Ptr(1),
+				Min:                   pointer.Int32Ptr(1),
 				TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second},
 				TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5 * time.Second},
 			},

cmd/kubeadm/app/phases/kubelet/flags.go

@@ -55,9 +55,9 @@ func WriteKubeletDynamicEnvFile(nodeRegOpts *kubeadmapi.NodeRegistrationOptions,
 		nodeRegOpts:              nodeRegOpts,
 		featureGates:             featureGates,
 		registerTaintsUsingFlags: registerTaintsUsingFlags,
-		execer:          utilsexec.New(),
-		pidOfFunc:       procfs.PidOf,
-		defaultHostname: hostName,
+		execer:                   utilsexec.New(),
+		pidOfFunc:                procfs.PidOf,
+		defaultHostname:          hostName,
 	}
 	stringMap := buildKubeletArgMap(flagOpts)
 	argList := kubeadmutil.BuildArgumentListFromMap(stringMap, nodeRegOpts.KubeletExtraArgs)

cmd/kubeadm/app/phases/kubelet/flags_test.go

@@ -206,9 +206,9 @@ func TestBuildKubeletArgMap(t *testing.T) {
 					},
 				},
 				registerTaintsUsingFlags: true,
-				execer:          cgroupfsCgroupExecer,
-				pidOfFunc:       binaryNotRunningPidOfFunc,
-				defaultHostname: "foo",
+				execer:                   cgroupfsCgroupExecer,
+				pidOfFunc:                binaryNotRunningPidOfFunc,
+				defaultHostname:          "foo",
 			},
 			expected: map[string]string{
 				"container-runtime":          "remote",

cmd/kubeadm/app/phases/selfhosting/podspec_mutation_test.go

@@ -130,7 +130,7 @@ func TestAddNodeSelectorToPodSpec(t *testing.T) {
 			},
 			expected: v1.PodSpec{
 				NodeSelector: map[string]string{
-					"foo": "bar",
+					"foo":                                "bar",
 					kubeadmconstants.LabelNodeRoleMaster: "",
 				},
 			},

cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go

@@ -166,7 +166,7 @@ func TestGetClusterStatus(t *testing.T) {
 		expectedClusterEndpoints int
 	}{
 		{
-			name: "return empty ClusterStatus if cluster kubeadm-config doesn't exist (e.g init)",
+			name:                     "return empty ClusterStatus if cluster kubeadm-config doesn't exist (e.g init)",
 			expectedClusterEndpoints: 0,
 		},
 		{

cmd/kubeadm/app/util/kubeconfig/kubeconfig.go

@@ -32,7 +32,7 @@ func CreateBasic(serverURL, clusterName, userName string, caCert []byte) *client
 	return &clientcmdapi.Config{
 		Clusters: map[string]*clientcmdapi.Cluster{
 			clusterName: {
-				Server: serverURL,
+				Server:                   serverURL,
 				CertificateAuthorityData: caCert,
 			},
 		},

cmd/kubeadm/app/util/system/package_validator_test.go

@@ -166,8 +166,8 @@ func TestValidatePackageVersion(t *testing.T) {
 	testKernelRelease := "test-kernel-release"
 	manager := testPackageManager{
 		packageVersions: map[string]string{
-			"foo": "1.0.0",
-			"bar": "2.1.0",
+			"foo":                      "1.0.0",
+			"bar":                      "2.1.0",
 			"bar-" + testKernelRelease: "3.0.0",
 		},
 	}

hack/lib/golang.sh

@@ -360,7 +360,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.10.2
+  minimum_go_version=go1.11.1
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     kube::log::usage_from_stdin <<EOF
 Detected go version: ${go_version[*]}.

pkg/api/service/util_test.go

@@ -151,25 +151,25 @@ func TestRequestsOnlyLocalTraffic(t *testing.T) {
 	})
 	checkRequestsOnlyLocalTraffic(false, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeNodePort,
+			Type:                  api.ServiceTypeNodePort,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(true, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeNodePort,
+			Type:                  api.ServiceTypeNodePort,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(false, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeLoadBalancer,
+			Type:                  api.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(true, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeLoadBalancer,
+			Type:                  api.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
@@ -191,25 +191,25 @@ func TestNeedsHealthCheck(t *testing.T) {
 	})
 	checkNeedsHealthCheck(false, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeNodePort,
+			Type:                  api.ServiceTypeNodePort,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkNeedsHealthCheck(false, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeNodePort,
+			Type:                  api.ServiceTypeNodePort,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
 	checkNeedsHealthCheck(false, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeLoadBalancer,
+			Type:                  api.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkNeedsHealthCheck(true, &api.Service{
 		Spec: api.ServiceSpec{
-			Type: api.ServiceTypeLoadBalancer,
+			Type:                  api.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: api.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})

pkg/api/v1/service/util_test.go

@@ -151,25 +151,25 @@ func TestRequestsOnlyLocalTraffic(t *testing.T) {
 	})
 	checkRequestsOnlyLocalTraffic(false, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeNodePort,
+			Type:                  v1.ServiceTypeNodePort,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(true, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeNodePort,
+			Type:                  v1.ServiceTypeNodePort,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(false, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeLoadBalancer,
+			Type:                  v1.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkRequestsOnlyLocalTraffic(true, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeLoadBalancer,
+			Type:                  v1.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
@@ -191,25 +191,25 @@ func TestNeedsHealthCheck(t *testing.T) {
 	})
 	checkNeedsHealthCheck(false, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeNodePort,
+			Type:                  v1.ServiceTypeNodePort,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkNeedsHealthCheck(false, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeNodePort,
+			Type:                  v1.ServiceTypeNodePort,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})
 	checkNeedsHealthCheck(false, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeLoadBalancer,
+			Type:                  v1.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeCluster,
 		},
 	})
 	checkNeedsHealthCheck(true, &v1.Service{
 		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeLoadBalancer,
+			Type:                  v1.ServiceTypeLoadBalancer,
 			ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyTypeLocal,
 		},
 	})

pkg/apis/authorization/validation/validation_test.go

@@ -51,7 +51,7 @@ func TestValidateSARSpec(t *testing.T) {
 			obj: authorizationapi.SubjectAccessReviewSpec{
 				ResourceAttributes:    &authorizationapi.ResourceAttributes{},
 				NonResourceAttributes: &authorizationapi.NonResourceAttributes{},
-				User: "me",
+				User:                  "me",
 			},
 			msg: "cannot be specified in combination with resourceAttributes",
 		},
@@ -183,7 +183,7 @@ func TestValidateLocalSAR(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{Namespace: "a"},
 				Spec: authorizationapi.SubjectAccessReviewSpec{
 					NonResourceAttributes: &authorizationapi.NonResourceAttributes{},
-					User: "user",
+					User:                  "user",
 				},
 			},
 			msg: "disallowed on this kind of request",

pkg/apis/autoscaling/v2beta1/defaults.go

@@ -39,7 +39,7 @@ func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2beta1.HorizontalPodAu
 			{
 				Type: autoscalingv2beta1.ResourceMetricSourceType,
 				Resource: &autoscalingv2beta1.ResourceMetricSource{
-					Name: v1.ResourceCPU,
+					Name:                     v1.ResourceCPU,
 					TargetAverageUtilization: &utilizationDefaultVal,
 				},
 			},

pkg/apis/autoscaling/v2beta1/defaults_test.go

@@ -39,7 +39,7 @@ func TestSetDefaultHPA(t *testing.T) {
 		{
 			Type: autoscalingv2beta1.ResourceMetricSourceType,
 			Resource: &autoscalingv2beta1.ResourceMetricSource{
-				Name: v1.ResourceCPU,
+				Name:                     v1.ResourceCPU,
 				TargetAverageUtilization: &utilizationDefaultVal,
 			},
 		},

pkg/apis/core/validation/validation_test.go

@@ -10285,14 +10285,14 @@ func TestValidateNode(t *testing.T) {
 		for i := range errs {
 			field := errs[i].Field
 			expectedFields := map[string]bool{
-				"metadata.name":                                                                                               true,
-				"metadata.labels":                                                                                             true,
-				"metadata.annotations":                                                                                        true,
-				"metadata.namespace":                                                                                          true,
-				"spec.externalID":                                                                                             true,
-				"spec.taints[0].key":                                                                                          true,
-				"spec.taints[0].value":                                                                                        true,
-				"spec.taints[0].effect":                                                                                       true,
+				"metadata.name":         true,
+				"metadata.labels":       true,
+				"metadata.annotations":  true,
+				"metadata.namespace":    true,
+				"spec.externalID":       true,
+				"spec.taints[0].key":    true,
+				"spec.taints[0].value":  true,
+				"spec.taints[0].effect": true,
 				"metadata.annotations.scheduler.alpha.kubernetes.io/preferAvoidPods[0].PodSignature":                          true,
 				"metadata.annotations.scheduler.alpha.kubernetes.io/preferAvoidPods[0].PodSignature.PodController.Controller": true,
 			}
@@ -12235,7 +12235,7 @@ func TestValidateBasicAuthSecret(t *testing.T) {
 		secret core.Secret
 		valid  bool
 	}{
-		"valid": {validBasicAuthSecret(), true},
+		"valid":                         {validBasicAuthSecret(), true},
 		"missing username and password": {missingBasicAuthUsernamePasswordKeys, false},
 	}
 

pkg/cloudprovider/providers/aws/aws_test.go

@@ -1123,7 +1123,7 @@ func TestGetLoadBalancerAdditionalTags(t *testing.T) {
 		{
 			Annotations: map[string]string{
 				ServiceAnnotationLoadBalancerAdditionalTags: "Key1=, Key2=Val2",
-				"anotherKey":                                "anotherValue",
+				"anotherKey": "anotherValue",
 			},
 			Tags: map[string]string{
 				"Key1": "",

pkg/cloudprovider/providers/azure/azure_loadbalancer.go

@@ -702,7 +702,7 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
 
 			newConfigs = append(newConfigs,
 				network.FrontendIPConfiguration{
-					Name: to.StringPtr(lbFrontendIPConfigName),
+					Name:                                    to.StringPtr(lbFrontendIPConfigName),
 					FrontendIPConfigurationPropertiesFormat: fipConfigurationProperties,
 				})
 			glog.V(10).Infof("reconcileLoadBalancer for service (%s)(%t): lb frontendconfig(%s) - adding", serviceName, wantLb, lbFrontendIPConfigName)
@@ -1025,8 +1025,8 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
 						DestinationPortRange:     to.StringPtr(strconv.Itoa(int(port.Port))),
 						SourceAddressPrefix:      to.StringPtr(sourceAddressPrefixes[j]),
 						DestinationAddressPrefix: to.StringPtr(destinationIPAddress),
-						Access:    network.SecurityRuleAccessAllow,
-						Direction: network.SecurityRuleDirectionInbound,
+						Access:                   network.SecurityRuleAccessAllow,
+						Direction:                network.SecurityRuleDirectionInbound,
 					},
 				}
 			}
@@ -1226,8 +1226,8 @@ func makeConsolidatable(rule network.SecurityRule) network.SecurityRule {
 			SourceAddressPrefix:        rule.SourceAddressPrefix,
 			SourceAddressPrefixes:      rule.SourceAddressPrefixes,
 			DestinationAddressPrefixes: collectionOrSingle(rule.DestinationAddressPrefixes, rule.DestinationAddressPrefix),
-			Access:    rule.Access,
-			Direction: rule.Direction,
+			Access:                     rule.Access,
+			Direction:                  rule.Direction,
 		},
 	}
 }
@@ -1248,8 +1248,8 @@ func consolidate(existingRule network.SecurityRule, newRule network.SecurityRule
 			SourceAddressPrefix:        existingRule.SourceAddressPrefix,
 			SourceAddressPrefixes:      existingRule.SourceAddressPrefixes,
 			DestinationAddressPrefixes: destinations,
-			Access:    existingRule.Access,
-			Direction: existingRule.Direction,
+			Access:                     existingRule.Access,
+			Direction:                  existingRule.Direction,
 		},
 	}
 }

pkg/cloudprovider/providers/azure/azure_storageaccount.go

@@ -114,10 +114,10 @@ func (az *Cloud) ensureStorageAccount(accountName, accountType, resourceGroup, l
 			cp := storage.AccountCreateParameters{
 				Sku: &storage.Sku{Name: storage.SkuName(accountType)},
 				// switch to use StorageV2 as it's recommended according to https://docs.microsoft.com/en-us/azure/storage/common/storage-account-options
-				Kind: storage.StorageV2,
+				Kind:                              storage.StorageV2,
 				AccountPropertiesCreateParameters: &storage.AccountPropertiesCreateParameters{EnableHTTPSTrafficOnly: to.BoolPtr(true)},
-				Tags:     map[string]*string{"created-by": to.StringPtr("azure")},
-				Location: &location}
+				Tags:                              map[string]*string{"created-by": to.StringPtr("azure")},
+				Location:                          &location}
 
 			ctx, cancel := getContextWithCancel()
 			defer cancel()

pkg/cloudprovider/providers/azure/azure_test.go

@@ -952,7 +952,7 @@ func getTestCloud() (az *Cloud) {
 			RouteTableName:               "rt",
 			PrimaryAvailabilitySetName:   "as",
 			MaximumLoadBalancerRuleCount: 250,
-			VMType: vmTypeStandard,
+			VMType:                       vmTypeStandard,
 		},
 		nodeZones:          map[string]sets.String{},
 		nodeInformerSynced: func() bool { return true },
@@ -1968,8 +1968,8 @@ func TestIfServiceSpecifiesSharedRuleAndRuleExistsThenTheServicesPortAndAddressA
 				SourceAddressPrefix:      to.StringPtr("Internet"),
 				DestinationPortRange:     to.StringPtr("80"),
 				DestinationAddressPrefix: to.StringPtr("192.168.33.44"),
-				Access:    network.SecurityRuleAccessAllow,
-				Direction: network.SecurityRuleDirectionInbound,
+				Access:                   network.SecurityRuleAccessAllow,
+				Direction:                network.SecurityRuleDirectionInbound,
 			},
 		},
 	}

pkg/cloudprovider/providers/gce/gce_test.go

@@ -529,9 +529,9 @@ func TestGetRegionInURL(t *testing.T) {
 		"https://www.googleapis.com/compute/v1/projects/my-project/regions/us-central1/subnetworks/a": "us-central1",
 		"https://www.googleapis.com/compute/v1/projects/my-project/regions/us-west2/subnetworks/b":    "us-west2",
 		"projects/my-project/regions/asia-central1/subnetworks/c":                                     "asia-central1",
-		"regions/europe-north2":                                                                       "europe-north2",
-		"my-url":                                                                                      "",
-		"":                                                                                            "",
+		"regions/europe-north2": "europe-north2",
+		"my-url":                "",
+		"":                      "",
 	}
 	for input, output := range cases {
 		result := getRegionInURL(input)

pkg/cloudprovider/providers/vsphere/vclib/volumeoptions.go

@@ -38,7 +38,7 @@ type VolumeOptions struct {
 var (
 	// DiskFormatValidType specifies the valid disk formats
 	DiskFormatValidType = map[string]string{
-		ThinDiskType:                              ThinDiskType,
+		ThinDiskType: ThinDiskType,
 		strings.ToLower(EagerZeroedThickDiskType): EagerZeroedThickDiskType,
 		strings.ToLower(ZeroedThickDiskType):      PreallocatedDiskType,
 	}

pkg/controller/controller_utils_test.go

@@ -82,7 +82,7 @@ func newReplicationController(replicas int) *v1.ReplicationController {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Image: "foo/bar",
+							Image:                  "foo/bar",
 							TerminationMessagePath: v1.TerminationMessagePathDefault,
 							ImagePullPolicy:        v1.PullIfNotPresent,
 							SecurityContext:        securitycontext.ValidSecurityContextWithContainerDefaults(),
@@ -144,7 +144,7 @@ func newReplicaSet(name string, replicas int) *apps.ReplicaSet {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Image: "foo/bar",
+							Image:                  "foo/bar",
 							TerminationMessagePath: v1.TerminationMessagePathDefault,
 							ImagePullPolicy:        v1.PullIfNotPresent,
 							SecurityContext:        securitycontext.ValidSecurityContextWithContainerDefaults(),

pkg/controller/daemon/daemon_controller_test.go

@@ -111,7 +111,7 @@ func newDaemonSet(name string) *apps.DaemonSet {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Image: "foo/bar",
+							Image:                  "foo/bar",
 							TerminationMessagePath: v1.TerminationMessagePathDefault,
 							ImagePullPolicy:        v1.PullIfNotPresent,
 							SecurityContext:        securitycontext.ValidSecurityContextWithContainerDefaults(),
@@ -180,7 +180,7 @@ func newPod(podName string, nodeName string, label map[string]string, ds *apps.D
 		podSpec = v1.PodSpec{
 			Containers: []v1.Container{
 				{
-					Image: "foo/bar",
+					Image:                  "foo/bar",
 					TerminationMessagePath: v1.TerminationMessagePathDefault,
 					ImagePullPolicy:        v1.PullIfNotPresent,
 					SecurityContext:        securitycontext.ValidSecurityContextWithContainerDefaults(),

pkg/controller/namespace/namespace_controller.go

@@ -71,7 +71,7 @@ func NewNamespaceController(
 
 	// create the controller so we can inject the enqueue function
 	namespaceController := &NamespaceController{
-		queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "namespace"),
+		queue:                      workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "namespace"),
 		namespacedResourcesDeleter: deletion.NewNamespacedResourcesDeleter(kubeClient.CoreV1().Namespaces(), dynamicClient, kubeClient.CoreV1(), discoverResourcesFn, finalizerToken, true),
 	}
 

pkg/controller/podautoscaler/horizontal.go

@@ -117,9 +117,9 @@ func NewHorizontalController(
 		scaleNamespacer:              scaleNamespacer,
 		hpaNamespacer:                hpaNamespacer,
 		downscaleStabilisationWindow: downscaleStabilisationWindow,
-		queue:           workqueue.NewNamedRateLimitingQueue(NewDefaultHPARateLimiter(resyncPeriod), "horizontalpodautoscaler"),
-		mapper:          mapper,
-		recommendations: map[string][]timestampedRecommendation{},
+		queue:                        workqueue.NewNamedRateLimitingQueue(NewDefaultHPARateLimiter(resyncPeriod), "horizontalpodautoscaler"),
+		mapper:                       mapper,
+		recommendations:              map[string][]timestampedRecommendation{},
 	}
 
 	hpaInformer.Informer().AddEventHandlerWithResyncPeriod(

pkg/controller/podautoscaler/legacy_horizontal_test.go

@@ -179,7 +179,7 @@ func (tc *legacyTestCase) prepareTestClient(t *testing.T) (*fake.Clientset, *sca
 				{
 					Type: autoscalingv2.ResourceMetricSourceType,
 					Resource: &autoscalingv2.ResourceMetricSource{
-						Name: v1.ResourceCPU,
+						Name:                     v1.ResourceCPU,
 						TargetAverageUtilization: &tc.CPUTarget,
 					},
 				},

pkg/controller/replicaset/replica_set_test.go

@@ -101,7 +101,7 @@ func newReplicaSet(replicas int, selectorMap map[string]string) *apps.ReplicaSet
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Image: "foo/bar",
+							Image:                  "foo/bar",
 							TerminationMessagePath: v1.TerminationMessagePathDefault,
 							ImagePullPolicy:        v1.PullIfNotPresent,
 							SecurityContext:        securitycontext.ValidSecurityContextWithContainerDefaults(),

pkg/controller/route/route_controller_test.go

@@ -98,12 +98,12 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -115,11 +115,11 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -132,8 +132,8 @@ func TestReconcile(t *testing.T) {
 			},
 			initialRoutes: []*cloudprovider.Route{},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -145,14 +145,14 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
-				{cluster + "-03", "node-3", "10.120.2.0/24", false},
-				{cluster + "-04", "node-4", "10.120.3.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
+				{Name: cluster + "-03", TargetNode: "node-3", DestinationCIDR: "10.120.2.0/24", Blackhole: false},
+				{Name: cluster + "-04", TargetNode: "node-4", DestinationCIDR: "10.120.3.0/24", Blackhole: false},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -164,12 +164,12 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-03", "node-3", "10.120.2.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-03", TargetNode: "node-3", DestinationCIDR: "10.120.2.0/24", Blackhole: false},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -182,7 +182,7 @@ func TestReconcile(t *testing.T) {
 			},
 			initialRoutes: []*cloudprovider.Route{},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, false},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, nodeNoCidr}}),
@@ -194,13 +194,13 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
-				{cluster + "-03", "", "10.120.2.0/24", true},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
+				{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.120.2.0/24", Blackhole: true},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
@@ -212,14 +212,14 @@ func TestReconcile(t *testing.T) {
 				&node2,
 			},
 			initialRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
-				{cluster + "-03", "", "10.1.2.0/24", true},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
+				{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.1.2.0/24", Blackhole: true},
 			},
 			expectedRoutes: []*cloudprovider.Route{
-				{cluster + "-01", "node-1", "10.120.0.0/24", false},
-				{cluster + "-02", "node-2", "10.120.1.0/24", false},
-				{cluster + "-03", "", "10.1.2.0/24", true},
+				{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
+				{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
+				{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.1.2.0/24", Blackhole: true},
 			},
 			expectedNetworkUnavailable: []bool{true, true},
 			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),

pkg/controller/serviceaccount/serviceaccounts_controller.go

@@ -65,7 +65,7 @@ func NewServiceAccountsController(saInformer coreinformers.ServiceAccountInforme
 	e := &ServiceAccountsController{
 		client:                  cl,
 		serviceAccountsToEnsure: options.ServiceAccounts,
-		queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "serviceaccount"),
+		queue:                   workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "serviceaccount"),
 	}
 	if cl != nil && cl.CoreV1().RESTClient().GetRateLimiter() != nil {
 		if err := metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.CoreV1().RESTClient().GetRateLimiter()); err != nil {

pkg/controller/volume/persistentvolume/index_test.go

@@ -1245,27 +1245,27 @@ func TestAlphaStorageObjectInUseProtectionFiltering(t *testing.T) {
 		enableStorageObjectInUseProtection bool
 	}{
 		"feature enabled - pv deletionTimeStamp not set": {
-			isExpectedMatch: true,
-			vol:             pv,
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                pv,
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: true,
 		},
 		"feature enabled - pv deletionTimeStamp set": {
-			isExpectedMatch: false,
-			vol:             pvToDelete,
-			pvc:             pvc,
+			isExpectedMatch:                    false,
+			vol:                                pvToDelete,
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: true,
 		},
 		"feature disabled - pv deletionTimeStamp not set": {
-			isExpectedMatch: true,
-			vol:             pv,
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                pv,
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: false,
 		},
 		"feature disabled - pv deletionTimeStamp set": {
-			isExpectedMatch: true,
-			vol:             pvToDelete,
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                pvToDelete,
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: false,
 		},
 	}
@@ -1291,27 +1291,27 @@ func TestAlphaStorageObjectInUseProtectionFiltering(t *testing.T) {
 		enableStorageObjectInUseProtection bool
 	}{
 		"feature enabled - pv deletionTimeStamp not set": {
-			isExpectedMatch: true,
-			vol:             createTestVolOrderedIndex(pv),
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                createTestVolOrderedIndex(pv),
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: true,
 		},
 		"feature enabled - pv deletionTimeStamp set": {
-			isExpectedMatch: false,
-			vol:             createTestVolOrderedIndex(pvToDelete),
-			pvc:             pvc,
+			isExpectedMatch:                    false,
+			vol:                                createTestVolOrderedIndex(pvToDelete),
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: true,
 		},
 		"feature disabled - pv deletionTimeStamp not set": {
-			isExpectedMatch: true,
-			vol:             createTestVolOrderedIndex(pv),
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                createTestVolOrderedIndex(pv),
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: false,
 		},
 		"feature disabled - pv deletionTimeStamp set": {
-			isExpectedMatch: true,
-			vol:             createTestVolOrderedIndex(pvToDelete),
-			pvc:             pvc,
+			isExpectedMatch:                    true,
+			vol:                                createTestVolOrderedIndex(pvToDelete),
+			pvc:                                pvc,
 			enableStorageObjectInUseProtection: false,
 		},
 	}

pkg/controller/volume/persistentvolume/pv_controller_base.go

@@ -79,12 +79,12 @@ func NewController(p ControllerParameters) (*PersistentVolumeController, error)
 	}
 
 	controller := &PersistentVolumeController{
-		volumes:           newPersistentVolumeOrderedIndex(),
-		claims:            cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc),
-		kubeClient:        p.KubeClient,
-		eventRecorder:     eventRecorder,
-		runningOperations: goroutinemap.NewGoRoutineMap(true /* exponentialBackOffOnError */),
-		cloud:             p.Cloud,
+		volumes:                       newPersistentVolumeOrderedIndex(),
+		claims:                        cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc),
+		kubeClient:                    p.KubeClient,
+		eventRecorder:                 eventRecorder,
+		runningOperations:             goroutinemap.NewGoRoutineMap(true /* exponentialBackOffOnError */),
+		cloud:                         p.Cloud,
 		enableDynamicProvisioning:     p.EnableDynamicProvisioning,
 		clusterName:                   p.ClusterName,
 		createProvisionedPVRetryCount: createProvisionedPVRetryCount,

pkg/controller/volume/pvcprotection/pvc_protection_controller.go

@@ -57,8 +57,8 @@ type Controller struct {
 // NewPVCProtectionController returns a new instance of PVCProtectionController.
 func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface, storageObjectInUseProtectionFeatureEnabled bool) *Controller {
 	e := &Controller{
-		client: cl,
-		queue:  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvcprotection"),
+		client:                              cl,
+		queue:                               workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvcprotection"),
 		storageObjectInUseProtectionEnabled: storageObjectInUseProtectionFeatureEnabled,
 	}
 	if cl != nil && cl.CoreV1().RESTClient().GetRateLimiter() != nil {

pkg/controller/volume/pvprotection/pv_protection_controller.go

@@ -53,8 +53,8 @@ type Controller struct {
 // NewPVProtectionController returns a new *Controller.
 func NewPVProtectionController(pvInformer coreinformers.PersistentVolumeInformer, cl clientset.Interface, storageObjectInUseProtectionFeatureEnabled bool) *Controller {
 	e := &Controller{
-		client: cl,
-		queue:  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvprotection"),
+		client:                              cl,
+		queue:                               workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvprotection"),
 		storageObjectInUseProtectionEnabled: storageObjectInUseProtectionFeatureEnabled,
 	}
 	if cl != nil && cl.CoreV1().RESTClient().GetRateLimiter() != nil {

pkg/features/kube_features.go

@@ -387,8 +387,8 @@ func init() {
 // To add a new feature, define a key for it above and add it here. The features will be
 // available throughout Kubernetes binaries.
 var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{
-	AppArmor:                                    {Default: true, PreRelease: utilfeature.Beta},
-	DynamicKubeletConfig:                        {Default: true, PreRelease: utilfeature.Beta},
+	AppArmor:             {Default: true, PreRelease: utilfeature.Beta},
+	DynamicKubeletConfig: {Default: true, PreRelease: utilfeature.Beta},
 	ExperimentalHostUserNamespaceDefaultingGate: {Default: false, PreRelease: utilfeature.Beta},
 	ExperimentalCriticalPodAnnotation:           {Default: false, PreRelease: utilfeature.Alpha},
 	DevicePlugins:                               {Default: true, PreRelease: utilfeature.Beta},

pkg/fieldpath/fieldpath_test.go

@@ -160,9 +160,9 @@ func TestExtractFieldPathAsString(t *testing.T) {
 			expectedMessageFragment: "invalid key subscript in metadata.labels",
 		},
 		{
-			name:      "invalid subscript",
-			fieldPath: "metadata.notexisting['something']",
-			obj:       &v1.Pod{},
+			name:                    "invalid subscript",
+			fieldPath:               "metadata.notexisting['something']",
+			obj:                     &v1.Pod{},
 			expectedMessageFragment: "fieldPath \"metadata.notexisting['something']\" does not support subscript",
 		},
 	}

pkg/kubeapiserver/options/authorization.go

@@ -39,7 +39,7 @@ type BuiltInAuthorizationOptions struct {
 
 func NewBuiltInAuthorizationOptions() *BuiltInAuthorizationOptions {
 	return &BuiltInAuthorizationOptions{
-		Modes: []string{authzmodes.ModeAlwaysAllow},
+		Modes:                       []string{authzmodes.ModeAlwaysAllow},
 		WebhookCacheAuthorizedTTL:   5 * time.Minute,
 		WebhookCacheUnauthorizedTTL: 30 * time.Second,
 	}

pkg/kubectl/cmd/annotate.go

@@ -123,11 +123,11 @@ func NewCmdAnnotate(parent string, f cmdutil.Factory, ioStreams genericclioption
 	o := NewAnnotateOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "annotate [--overwrite] (-f FILENAME | TYPE NAME) KEY_1=VAL_1 ... KEY_N=VAL_N [--resource-version=version]",
+		Use:                   "annotate [--overwrite] (-f FILENAME | TYPE NAME) KEY_1=VAL_1 ... KEY_N=VAL_N [--resource-version=version]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Update the annotations on a resource"),
-		Long:    annotateLong + "\n\n" + cmdutil.SuggestApiResources(parent),
-		Example: annotateExample,
+		Short:                 i18n.T("Update the annotations on a resource"),
+		Long:                  annotateLong + "\n\n" + cmdutil.SuggestApiResources(parent),
+		Example:               annotateExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/apply.go

@@ -146,11 +146,11 @@ func NewCmdApply(baseName string, f cmdutil.Factory, ioStreams genericclioptions
 	o.cmdBaseName = baseName
 
 	cmd := &cobra.Command{
-		Use: "apply -f FILENAME",
+		Use:                   "apply -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Apply a configuration to a resource by filename or stdin"),
-		Long:    applyLong,
-		Example: applyExample,
+		Short:                 i18n.T("Apply a configuration to a resource by filename or stdin"),
+		Long:                  applyLong,
+		Example:               applyExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(validateArgs(cmd, args))

pkg/kubectl/cmd/apply_edit_last_applied.go

@@ -59,11 +59,11 @@ func NewCmdApplyEditLastApplied(f cmdutil.Factory, ioStreams genericclioptions.I
 	o := editor.NewEditOptions(editor.ApplyEditMode, ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "edit-last-applied (RESOURCE/NAME | -f FILENAME)",
+		Use:                   "edit-last-applied (RESOURCE/NAME | -f FILENAME)",
 		DisableFlagsInUseLine: true,
-		Short:   "Edit latest last-applied-configuration annotations of a resource/object",
-		Long:    applyEditLastAppliedLong,
-		Example: applyEditLastAppliedExample,
+		Short:                 "Edit latest last-applied-configuration annotations of a resource/object",
+		Long:                  applyEditLastAppliedLong,
+		Example:               applyEditLastAppliedExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := o.Complete(f, args, cmd); err != nil {
 				cmdutil.CheckErr(err)

pkg/kubectl/cmd/apply_set_last_applied.go

@@ -91,11 +91,11 @@ func NewSetLastAppliedOptions(ioStreams genericclioptions.IOStreams) *SetLastApp
 func NewCmdApplySetLastApplied(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
 	o := NewSetLastAppliedOptions(ioStreams)
 	cmd := &cobra.Command{
-		Use: "set-last-applied -f FILENAME",
+		Use:                   "set-last-applied -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Set the last-applied-configuration annotation on a live object to match the contents of a file."),
-		Long:    applySetLastAppliedLong,
-		Example: applySetLastAppliedExample,
+		Short:                 i18n.T("Set the last-applied-configuration annotation on a live object to match the contents of a file."),
+		Long:                  applySetLastAppliedLong,
+		Example:               applySetLastAppliedExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/apply_view_last_applied.go

@@ -69,11 +69,11 @@ func NewCmdApplyViewLastApplied(f cmdutil.Factory, ioStreams genericclioptions.I
 	options := NewViewLastAppliedOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "view-last-applied (TYPE [NAME | -l label] | TYPE/NAME | -f FILENAME)",
+		Use:                   "view-last-applied (TYPE [NAME | -l label] | TYPE/NAME | -f FILENAME)",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("View latest last-applied-configuration annotations of a resource/object"),
-		Long:    applyViewLastAppliedLong,
-		Example: applyViewLastAppliedExample,
+		Short:                 i18n.T("View latest last-applied-configuration annotations of a resource/object"),
+		Long:                  applyViewLastAppliedLong,
+		Example:               applyViewLastAppliedExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(cmd, f, args))
 			cmdutil.CheckErr(options.Validate(cmd))

pkg/kubectl/cmd/attach.go

@@ -96,11 +96,11 @@ func NewAttachOptions(streams genericclioptions.IOStreams) *AttachOptions {
 func NewCmdAttach(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := NewAttachOptions(streams)
 	cmd := &cobra.Command{
-		Use: "attach (POD | TYPE/NAME) -c CONTAINER",
+		Use:                   "attach (POD | TYPE/NAME) -c CONTAINER",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Attach to a running container"),
-		Long:    "Attach to a process that is already running inside an existing container.",
-		Example: attachExample,
+		Short:                 i18n.T("Attach to a running container"),
+		Long:                  "Attach to a process that is already running inside an existing container.",
+		Example:               attachExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/attach_test.go

@@ -83,7 +83,7 @@ func TestPodAndContainerAttach(t *testing.T) {
 			args:                  []string{"foo"},
 			expectedPodName:       "foo",
 			expectedContainerName: "bar",
-			obj: attachPod(),
+			obj:                   attachPod(),
 		},
 		{
 			name:                  "container in flag",
@@ -91,7 +91,7 @@ func TestPodAndContainerAttach(t *testing.T) {
 			args:                  []string{"foo"},
 			expectedPodName:       "foo",
 			expectedContainerName: "bar",
-			obj: attachPod(),
+			obj:                   attachPod(),
 		},
 		{
 			name:                  "init container in flag",
@@ -99,7 +99,7 @@ func TestPodAndContainerAttach(t *testing.T) {
 			args:                  []string{"foo"},
 			expectedPodName:       "foo",
 			expectedContainerName: "initfoo",
-			obj: attachPod(),
+			obj:                   attachPod(),
 		},
 		{
 			name:            "non-existing container",
@@ -115,7 +115,7 @@ func TestPodAndContainerAttach(t *testing.T) {
 			args:                  []string{"pods", "foo"},
 			expectedPodName:       "foo",
 			expectedContainerName: "bar",
-			obj: attachPod(),
+			obj:                   attachPod(),
 		},
 		{
 			name:                  "invalid get pod timeout value",
@@ -123,8 +123,8 @@ func TestPodAndContainerAttach(t *testing.T) {
 			args:                  []string{"pod/foo"},
 			expectedPodName:       "foo",
 			expectedContainerName: "bar",
-			obj:         attachPod(),
-			expectError: "must be higher than zero",
+			obj:                   attachPod(),
+			expectError:           "must be higher than zero",
 		},
 	}
 

pkg/kubectl/cmd/auth/cani.go

@@ -86,11 +86,11 @@ func NewCmdCanI(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
 	}
 
 	cmd := &cobra.Command{
-		Use: "can-i VERB [TYPE | TYPE/NAME | NONRESOURCEURL]",
+		Use:                   "can-i VERB [TYPE | TYPE/NAME | NONRESOURCEURL]",
 		DisableFlagsInUseLine: true,
-		Short:   "Check whether an action is allowed",
-		Long:    canILong,
-		Example: canIExample,
+		Short:                 "Check whether an action is allowed",
+		Long:                  canILong,
+		Example:               canIExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, args))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/auth/reconcile.go

@@ -78,11 +78,11 @@ func NewCmdReconcile(f cmdutil.Factory, streams genericclioptions.IOStreams) *co
 	o := NewReconcileOptions(streams)
 
 	cmd := &cobra.Command{
-		Use: "reconcile -f FILENAME",
+		Use:                   "reconcile -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   "Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRole binding objects",
-		Long:    reconcileLong,
-		Example: reconcileExample,
+		Short:                 "Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRole binding objects",
+		Long:                  reconcileLong,
+		Example:               reconcileExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(cmd, f, args))
 			cmdutil.CheckErr(o.Validate())
@@ -182,7 +182,7 @@ func (o *ReconcileOptions) RunReconcile() error {
 			reconcileOptions := reconciliation.ReconcileRoleOptions{
 				Confirm:                !o.DryRun,
 				RemoveExtraPermissions: o.RemoveExtraPermissions,
-				Role: reconciliation.RoleRuleOwner{Role: t},
+				Role:                   reconciliation.RoleRuleOwner{Role: t},
 				Client: reconciliation.RoleModifier{
 					NamespaceClient: o.NamespaceClient.Namespaces(),
 					Client:          o.RBACClient,
@@ -198,7 +198,7 @@ func (o *ReconcileOptions) RunReconcile() error {
 			reconcileOptions := reconciliation.ReconcileRoleOptions{
 				Confirm:                !o.DryRun,
 				RemoveExtraPermissions: o.RemoveExtraPermissions,
-				Role: reconciliation.ClusterRoleRuleOwner{ClusterRole: t},
+				Role:                   reconciliation.ClusterRoleRuleOwner{ClusterRole: t},
 				Client: reconciliation.ClusterRoleModifier{
 					Client: o.RBACClient.ClusterRoles(),
 				},

pkg/kubectl/cmd/autoscale.go

@@ -97,11 +97,11 @@ func NewCmdAutoscale(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *
 	validArgs := []string{"deployment", "replicaset", "replicationcontroller"}
 
 	cmd := &cobra.Command{
-		Use: "autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU]",
+		Use:                   "autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Auto-scale a Deployment, ReplicaSet, or ReplicationController"),
-		Long:    autoscaleLong,
-		Example: autoscaleExample,
+		Short:                 i18n.T("Auto-scale a Deployment, ReplicaSet, or ReplicationController"),
+		Long:                  autoscaleLong,
+		Example:               autoscaleExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/certificates.go

@@ -38,10 +38,10 @@ import (
 
 func NewCmdCertificate(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "certificate SUBCOMMAND",
+		Use:                   "certificate SUBCOMMAND",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Modify certificate resources."),
-		Long:  "Modify certificate resources.",
+		Short:                 i18n.T("Modify certificate resources."),
+		Long:                  "Modify certificate resources.",
 		Run: func(cmd *cobra.Command, args []string) {
 			cmd.Help()
 		},
@@ -108,9 +108,9 @@ func NewCmdCertificateApprove(f cmdutil.Factory, ioStreams genericclioptions.IOS
 		IOStreams:  ioStreams,
 	}
 	cmd := &cobra.Command{
-		Use: "approve (-f FILENAME | NAME)",
+		Use:                   "approve (-f FILENAME | NAME)",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Approve a certificate signing request"),
+		Short:                 i18n.T("Approve a certificate signing request"),
 		Long: templates.LongDesc(`
 		Approve a certificate signing request.
 
@@ -165,9 +165,9 @@ func NewCmdCertificateDeny(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 		IOStreams:  ioStreams,
 	}
 	cmd := &cobra.Command{
-		Use: "deny (-f FILENAME | NAME)",
+		Use:                   "deny (-f FILENAME | NAME)",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Deny a certificate signing request"),
+		Short:                 i18n.T("Deny a certificate signing request"),
 		Long: templates.LongDesc(`
 		Deny a certificate signing request.
 

pkg/kubectl/cmd/completion.go

@@ -99,11 +99,11 @@ func NewCmdCompletion(out io.Writer, boilerPlate string) *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use: "completion SHELL",
+		Use:                   "completion SHELL",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Output shell completion code for the specified shell (bash or zsh)"),
-		Long:    completion_long,
-		Example: completion_example,
+		Short:                 i18n.T("Output shell completion code for the specified shell (bash or zsh)"),
+		Long:                  completion_long,
+		Example:               completion_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			err := RunCompletion(out, boilerPlate, cmd, args)
 			cmdutil.CheckErr(err)

pkg/kubectl/cmd/config/config.go

@@ -37,9 +37,9 @@ func NewCmdConfig(f cmdutil.Factory, pathOptions *clientcmd.PathOptions, streams
 	}
 
 	cmd := &cobra.Command{
-		Use: "config SUBCOMMAND",
+		Use:                   "config SUBCOMMAND",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Modify kubeconfig files"),
+		Short:                 i18n.T("Modify kubeconfig files"),
 		Long: templates.LongDesc(`
 			Modify kubeconfig files using subcommands like "kubectl config set current-context my-context"
 

pkg/kubectl/cmd/config/create_authinfo.go

@@ -100,11 +100,11 @@ func NewCmdConfigSetAuthInfo(out io.Writer, configAccess clientcmd.ConfigAccess)
 
 func newCmdConfigSetAuthInfo(out io.Writer, options *createAuthInfoOptions) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: fmt.Sprintf("set-credentials NAME [--%v=path/to/certfile] [--%v=path/to/keyfile] [--%v=bearer_token] [--%v=basic_user] [--%v=basic_password] [--%v=provider_name] [--%v=key=value]", clientcmd.FlagCertFile, clientcmd.FlagKeyFile, clientcmd.FlagBearerToken, clientcmd.FlagUsername, clientcmd.FlagPassword, flagAuthProvider, flagAuthProviderArg),
+		Use:                   fmt.Sprintf("set-credentials NAME [--%v=path/to/certfile] [--%v=path/to/keyfile] [--%v=bearer_token] [--%v=basic_user] [--%v=basic_password] [--%v=provider_name] [--%v=key=value]", clientcmd.FlagCertFile, clientcmd.FlagKeyFile, clientcmd.FlagBearerToken, clientcmd.FlagUsername, clientcmd.FlagPassword, flagAuthProvider, flagAuthProviderArg),
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Sets a user entry in kubeconfig"),
-		Long:    create_authinfo_long,
-		Example: create_authinfo_example,
+		Short:                 i18n.T("Sets a user entry in kubeconfig"),
+		Long:                  create_authinfo_long,
+		Example:               create_authinfo_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			err := options.complete(cmd, out)
 			if err != nil {

pkg/kubectl/cmd/config/create_cluster.go

@@ -63,11 +63,11 @@ func NewCmdConfigSetCluster(out io.Writer, configAccess clientcmd.ConfigAccess)
 	options := &createClusterOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: fmt.Sprintf("set-cluster NAME [--%v=server] [--%v=path/to/certificate/authority] [--%v=true]", clientcmd.FlagAPIServer, clientcmd.FlagCAFile, clientcmd.FlagInsecure),
+		Use:                   fmt.Sprintf("set-cluster NAME [--%v=server] [--%v=path/to/certificate/authority] [--%v=true]", clientcmd.FlagAPIServer, clientcmd.FlagCAFile, clientcmd.FlagInsecure),
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Sets a cluster entry in kubeconfig"),
-		Long:    create_cluster_long,
-		Example: create_cluster_example,
+		Short:                 i18n.T("Sets a cluster entry in kubeconfig"),
+		Long:                  create_cluster_long,
+		Example:               create_cluster_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd))
 			cmdutil.CheckErr(options.run())

pkg/kubectl/cmd/config/create_context.go

@@ -55,11 +55,11 @@ func NewCmdConfigSetContext(out io.Writer, configAccess clientcmd.ConfigAccess)
 	options := &createContextOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: fmt.Sprintf("set-context [NAME | --current] [--%v=cluster_nickname] [--%v=user_nickname] [--%v=namespace]", clientcmd.FlagClusterName, clientcmd.FlagAuthInfoName, clientcmd.FlagNamespace),
+		Use:                   fmt.Sprintf("set-context [NAME | --current] [--%v=cluster_nickname] [--%v=user_nickname] [--%v=namespace]", clientcmd.FlagClusterName, clientcmd.FlagAuthInfoName, clientcmd.FlagNamespace),
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Sets a context entry in kubeconfig"),
-		Long:    create_context_long,
-		Example: create_context_example,
+		Short:                 i18n.T("Sets a context entry in kubeconfig"),
+		Long:                  create_context_long,
+		Example:               create_context_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd))
 			name, exists, err := options.run()

pkg/kubectl/cmd/config/delete_cluster.go

@@ -35,11 +35,11 @@ var (
 
 func NewCmdConfigDeleteCluster(out io.Writer, configAccess clientcmd.ConfigAccess) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "delete-cluster NAME",
+		Use:                   "delete-cluster NAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Delete the specified cluster from the kubeconfig"),
-		Long:    "Delete the specified cluster from the kubeconfig",
-		Example: delete_cluster_example,
+		Short:                 i18n.T("Delete the specified cluster from the kubeconfig"),
+		Long:                  "Delete the specified cluster from the kubeconfig",
+		Example:               delete_cluster_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			err := runDeleteCluster(out, configAccess, cmd)
 			cmdutil.CheckErr(err)

pkg/kubectl/cmd/config/delete_context.go

@@ -35,11 +35,11 @@ var (
 
 func NewCmdConfigDeleteContext(out, errOut io.Writer, configAccess clientcmd.ConfigAccess) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "delete-context NAME",
+		Use:                   "delete-context NAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Delete the specified context from the kubeconfig"),
-		Long:    "Delete the specified context from the kubeconfig",
-		Example: delete_context_example,
+		Short:                 i18n.T("Delete the specified context from the kubeconfig"),
+		Long:                  "Delete the specified context from the kubeconfig",
+		Example:               delete_context_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			err := runDeleteContext(out, errOut, configAccess, cmd)
 			cmdutil.CheckErr(err)

pkg/kubectl/cmd/config/get_contexts.go

@@ -67,11 +67,11 @@ func NewCmdConfigGetContexts(streams genericclioptions.IOStreams, configAccess c
 	}
 
 	cmd := &cobra.Command{
-		Use: "get-contexts [(-o|--output=)name)]",
+		Use:                   "get-contexts [(-o|--output=)name)]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Describe one or many contexts"),
-		Long:    getContextsLong,
-		Example: getContextsExample,
+		Short:                 i18n.T("Describe one or many contexts"),
+		Long:                  getContextsLong,
+		Example:               getContextsExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			validOutputTypes := sets.NewString("", "json", "yaml", "wide", "name", "custom-columns", "custom-columns-file", "go-template", "go-template-file", "jsonpath", "jsonpath-file")
 			supportedOutputTypes := sets.NewString("", "name")

pkg/kubectl/cmd/config/rename_context.go

@@ -61,11 +61,11 @@ func NewCmdConfigRenameContext(out io.Writer, configAccess clientcmd.ConfigAcces
 	options := &RenameContextOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: renameContextUse,
+		Use:                   renameContextUse,
 		DisableFlagsInUseLine: true,
-		Short:   renameContextShort,
-		Long:    renameContextLong,
-		Example: renameContextExample,
+		Short:                 renameContextShort,
+		Long:                  renameContextLong,
+		Example:               renameContextExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := options.Complete(cmd, args, out); err != nil {
 				cmdutil.CheckErr(err)

pkg/kubectl/cmd/config/set.go

@@ -51,10 +51,10 @@ func NewCmdConfigSet(out io.Writer, configAccess clientcmd.ConfigAccess) *cobra.
 	options := &setOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: "set PROPERTY_NAME PROPERTY_VALUE",
+		Use:                   "set PROPERTY_NAME PROPERTY_VALUE",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Sets an individual value in a kubeconfig file"),
-		Long:  set_long,
+		Short:                 i18n.T("Sets an individual value in a kubeconfig file"),
+		Long:                  set_long,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd))
 			cmdutil.CheckErr(options.run())

pkg/kubectl/cmd/config/unset.go

@@ -53,11 +53,11 @@ func NewCmdConfigUnset(out io.Writer, configAccess clientcmd.ConfigAccess) *cobr
 	options := &unsetOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: "unset PROPERTY_NAME",
+		Use:                   "unset PROPERTY_NAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Unsets an individual value in a kubeconfig file"),
-		Long:    unsetLong,
-		Example: unsetExample,
+		Short:                 i18n.T("Unsets an individual value in a kubeconfig file"),
+		Long:                  unsetLong,
+		Example:               unsetExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd, args))
 			cmdutil.CheckErr(options.run(out))

pkg/kubectl/cmd/config/use_context.go

@@ -45,12 +45,12 @@ func NewCmdConfigUseContext(out io.Writer, configAccess clientcmd.ConfigAccess)
 	options := &useContextOptions{configAccess: configAccess}
 
 	cmd := &cobra.Command{
-		Use: "use-context CONTEXT_NAME",
+		Use:                   "use-context CONTEXT_NAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Sets the current-context in a kubeconfig file"),
-		Aliases: []string{"use"},
-		Long:    `Sets the current-context in a kubeconfig file`,
-		Example: use_context_example,
+		Short:                 i18n.T("Sets the current-context in a kubeconfig file"),
+		Aliases:               []string{"use"},
+		Long:                  `Sets the current-context in a kubeconfig file`,
+		Example:               use_context_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd))
 			cmdutil.CheckErr(options.run())

pkg/kubectl/cmd/convert.go

@@ -89,11 +89,11 @@ func NewCmdConvert(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *co
 	o := NewConvertOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "convert -f FILENAME",
+		Use:                   "convert -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Convert config files between different API versions"),
-		Long:    convert_long,
-		Example: convert_example,
+		Short:                 i18n.T("Convert config files between different API versions"),
+		Long:                  convert_long,
+		Example:               convert_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(o.RunConvert())

pkg/kubectl/cmd/cp.go

@@ -86,11 +86,11 @@ func NewCmdCp(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.C
 	o := NewCopyOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "cp <file-spec-src> <file-spec-dest>",
+		Use:                   "cp <file-spec-src> <file-spec-dest>",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Copy files and directories to and from containers."),
-		Long:    "Copy files and directories to and from containers.",
-		Example: cpExample,
+		Short:                 i18n.T("Copy files and directories to and from containers."),
+		Long:                  "Copy files and directories to and from containers.",
+		Example:               cpExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(o.Run(args))

pkg/kubectl/cmd/create/create.go

@@ -93,11 +93,11 @@ func NewCmdCreate(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cob
 	o := NewCreateOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "create -f FILENAME",
+		Use:                   "create -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a resource from a file or from stdin."),
-		Long:    createLong,
-		Example: createExample,
+		Short:                 i18n.T("Create a resource from a file or from stdin."),
+		Long:                  createLong,
+		Example:               createExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			if cmdutil.IsFilenameSliceEmpty(o.FilenameOptions.Filenames) {
 				defaultRunFunc := cmdutil.DefaultSubCommandRun(ioStreams.ErrOut)

pkg/kubectl/cmd/create/create_clusterrole.go

@@ -71,11 +71,11 @@ func NewCmdCreateClusterRole(f cmdutil.Factory, ioStreams genericclioptions.IOSt
 		AggregationRule:   map[string]string{},
 	}
 	cmd := &cobra.Command{
-		Use: "clusterrole NAME --verb=verb --resource=resource.group [--resource-name=resourcename] [--dry-run]",
+		Use:                   "clusterrole NAME --verb=verb --resource=resource.group [--resource-name=resourcename] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   clusterRoleLong,
-		Long:    clusterRoleLong,
-		Example: clusterRoleExample,
+		Short:                 clusterRoleLong,
+		Long:                  clusterRoleLong,
+		Example:               clusterRoleExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(c.Complete(f, cmd, args))
 			cmdutil.CheckErr(c.Validate())

pkg/kubectl/cmd/create/create_clusterrolebinding.go

@@ -46,11 +46,11 @@ func NewCmdCreateClusterRoleBinding(f cmdutil.Factory, ioStreams genericclioptio
 	}
 
 	cmd := &cobra.Command{
-		Use: "clusterrolebinding NAME --clusterrole=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run]",
+		Use:                   "clusterrolebinding NAME --clusterrole=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a ClusterRoleBinding for a particular ClusterRole"),
-		Long:    clusterRoleBindingLong,
-		Example: clusterRoleBindingExample,
+		Short:                 i18n.T("Create a ClusterRoleBinding for a particular ClusterRole"),
+		Long:                  clusterRoleBindingLong,
+		Example:               clusterRoleBindingExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())

pkg/kubectl/cmd/create/create_configmap.go

@@ -67,7 +67,7 @@ func NewCmdCreateConfigMap(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 	}
 
 	cmd := &cobra.Command{
-		Use: "configmap NAME [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run]",
+		Use:                   "configmap NAME [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"cm"},
 		Short:                 i18n.T("Create a configmap from a local file, directory or literal value"),

pkg/kubectl/cmd/create/create_deployment.go

@@ -48,7 +48,7 @@ func NewCmdCreateDeployment(f cmdutil.Factory, ioStreams genericclioptions.IOStr
 	}
 
 	cmd := &cobra.Command{
-		Use: "deployment NAME --image=image [--dry-run]",
+		Use:                   "deployment NAME --image=image [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"deploy"},
 		Short:                 i18n.T("Create a deployment with the specified name."),

pkg/kubectl/cmd/create/create_namespace.go

@@ -46,7 +46,7 @@ func NewCmdCreateNamespace(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 	}
 
 	cmd := &cobra.Command{
-		Use: "namespace NAME [--dry-run]",
+		Use:                   "namespace NAME [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ns"},
 		Short:                 i18n.T("Create a namespace with the specified name"),

pkg/kubectl/cmd/create/create_pdb.go

@@ -51,7 +51,7 @@ func NewCmdCreatePodDisruptionBudget(f cmdutil.Factory, ioStreams genericcliopti
 	}
 
 	cmd := &cobra.Command{
-		Use: "poddisruptionbudget NAME --selector=SELECTOR --min-available=N [--dry-run]",
+		Use:                   "poddisruptionbudget NAME --selector=SELECTOR --min-available=N [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"pdb"},
 		Short:                 i18n.T("Create a pod disruption budget with the specified name."),

pkg/kubectl/cmd/create/create_priorityclass.go

@@ -49,7 +49,7 @@ func NewCmdCreatePriorityClass(f cmdutil.Factory, ioStreams genericclioptions.IO
 	}
 
 	cmd := &cobra.Command{
-		Use: "priorityclass NAME --value=VALUE --global-default=BOOL [--dry-run]",
+		Use:                   "priorityclass NAME --value=VALUE --global-default=BOOL [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"pc"},
 		Short:                 i18n.T("Create a priorityclass with the specified name."),

pkg/kubectl/cmd/create/create_quota.go

@@ -49,7 +49,7 @@ func NewCmdCreateQuota(f cmdutil.Factory, ioStreams genericclioptions.IOStreams)
 	}
 
 	cmd := &cobra.Command{
-		Use: "quota NAME [--hard=key1=value1,key2=value2] [--scopes=Scope1,Scope2] [--dry-run=bool]",
+		Use:                   "quota NAME [--hard=key1=value1,key2=value2] [--scopes=Scope1,Scope2] [--dry-run=bool]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"resourcequota"},
 		Short:                 i18n.T("Create a quota with the specified name."),

pkg/kubectl/cmd/create/create_role.go

@@ -142,11 +142,11 @@ func NewCmdCreateRole(f cmdutil.Factory, ioStreams genericclioptions.IOStreams)
 	o := NewCreateRoleOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "role NAME --verb=verb --resource=resource.group/subresource [--resource-name=resourcename] [--dry-run]",
+		Use:                   "role NAME --verb=verb --resource=resource.group/subresource [--resource-name=resourcename] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   roleLong,
-		Long:    roleLong,
-		Example: roleExample,
+		Short:                 roleLong,
+		Long:                  roleLong,
+		Example:               roleExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate())

pkg/kubectl/cmd/create/create_rolebinding.go

@@ -46,11 +46,11 @@ func NewCmdCreateRoleBinding(f cmdutil.Factory, ioStreams genericclioptions.IOSt
 	}
 
 	cmd := &cobra.Command{
-		Use: "rolebinding NAME --clusterrole=NAME|--role=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run]",
+		Use:                   "rolebinding NAME --clusterrole=NAME|--role=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a RoleBinding for a particular Role or ClusterRole"),
-		Long:    roleBindingLong,
-		Example: roleBindingExample,
+		Short:                 i18n.T("Create a RoleBinding for a particular Role or ClusterRole"),
+		Long:                  roleBindingLong,
+		Example:               roleBindingExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())

pkg/kubectl/cmd/create/create_secret.go

@@ -83,11 +83,11 @@ func NewCmdCreateSecretGeneric(f cmdutil.Factory, ioStreams genericclioptions.IO
 	}
 
 	cmd := &cobra.Command{
-		Use: "generic NAME [--type=string] [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run]",
+		Use:                   "generic NAME [--type=string] [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a secret from a local file, directory or literal value"),
-		Long:    secretLong,
-		Example: secretExample,
+		Short:                 i18n.T("Create a secret from a local file, directory or literal value"),
+		Long:                  secretLong,
+		Example:               secretExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())
@@ -168,11 +168,11 @@ func NewCmdCreateSecretDockerRegistry(f cmdutil.Factory, ioStreams genericcliopt
 	}
 
 	cmd := &cobra.Command{
-		Use: "docker-registry NAME --docker-username=user --docker-password=password --docker-email=email [--docker-server=string] [--from-literal=key1=value1] [--dry-run]",
+		Use:                   "docker-registry NAME --docker-username=user --docker-password=password --docker-email=email [--docker-server=string] [--from-literal=key1=value1] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a secret for use with a Docker registry"),
-		Long:    secretForDockerRegistryLong,
-		Example: secretForDockerRegistryExample,
+		Short:                 i18n.T("Create a secret for use with a Docker registry"),
+		Long:                  secretForDockerRegistryLong,
+		Example:               secretForDockerRegistryExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())
@@ -259,11 +259,11 @@ func NewCmdCreateSecretTLS(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 	}
 
 	cmd := &cobra.Command{
-		Use: "tls NAME --cert=path/to/cert/file --key=path/to/key/file [--dry-run]",
+		Use:                   "tls NAME --cert=path/to/cert/file --key=path/to/key/file [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a TLS secret"),
-		Long:    secretForTLSLong,
-		Example: secretForTLSExample,
+		Short:                 i18n.T("Create a TLS secret"),
+		Long:                  secretForTLSLong,
+		Example:               secretForTLSExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())

pkg/kubectl/cmd/create/create_service.go

@@ -71,11 +71,11 @@ func NewCmdCreateServiceClusterIP(f cmdutil.Factory, ioStreams genericclioptions
 	}
 
 	cmd := &cobra.Command{
-		Use: "clusterip NAME [--tcp=<port>:<targetPort>] [--dry-run]",
+		Use:                   "clusterip NAME [--tcp=<port>:<targetPort>] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a ClusterIP service."),
-		Long:    serviceClusterIPLong,
-		Example: serviceClusterIPExample,
+		Short:                 i18n.T("Create a ClusterIP service."),
+		Long:                  serviceClusterIPLong,
+		Example:               serviceClusterIPExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())
@@ -143,11 +143,11 @@ func NewCmdCreateServiceNodePort(f cmdutil.Factory, ioStreams genericclioptions.
 	}
 
 	cmd := &cobra.Command{
-		Use: "nodeport NAME [--tcp=port:targetPort] [--dry-run]",
+		Use:                   "nodeport NAME [--tcp=port:targetPort] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a NodePort service."),
-		Long:    serviceNodePortLong,
-		Example: serviceNodePortExample,
+		Short:                 i18n.T("Create a NodePort service."),
+		Long:                  serviceNodePortLong,
+		Example:               serviceNodePortExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())
@@ -212,11 +212,11 @@ func NewCmdCreateServiceLoadBalancer(f cmdutil.Factory, ioStreams genericcliopti
 	}
 
 	cmd := &cobra.Command{
-		Use: "loadbalancer NAME [--tcp=port:targetPort] [--dry-run]",
+		Use:                   "loadbalancer NAME [--tcp=port:targetPort] [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create a LoadBalancer service."),
-		Long:    serviceLoadBalancerLong,
-		Example: serviceLoadBalancerExample,
+		Short:                 i18n.T("Create a LoadBalancer service."),
+		Long:                  serviceLoadBalancerLong,
+		Example:               serviceLoadBalancerExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())
@@ -283,11 +283,11 @@ func NewCmdCreateServiceExternalName(f cmdutil.Factory, ioStreams genericcliopti
 	}
 
 	cmd := &cobra.Command{
-		Use: "externalname NAME --external-name external.name [--dry-run]",
+		Use:                   "externalname NAME --external-name external.name [--dry-run]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Create an ExternalName service."),
-		Long:    serviceExternalNameLong,
-		Example: serviceExternalNameExample,
+		Short:                 i18n.T("Create an ExternalName service."),
+		Long:                  serviceExternalNameLong,
+		Example:               serviceExternalNameExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.Run())

pkg/kubectl/cmd/create/create_serviceaccount.go

@@ -46,7 +46,7 @@ func NewCmdCreateServiceAccount(f cmdutil.Factory, ioStreams genericclioptions.I
 	}
 
 	cmd := &cobra.Command{
-		Use: "serviceaccount NAME [--dry-run]",
+		Use:                   "serviceaccount NAME [--dry-run]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"sa"},
 		Short:                 i18n.T("Create a service account with the specified name"),

pkg/kubectl/cmd/delete.go

@@ -118,11 +118,11 @@ func NewCmdDelete(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra
 	deleteFlags := NewDeleteCommandFlags("containing the resource to delete.")
 
 	cmd := &cobra.Command{
-		Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
+		Use:                   "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Delete resources by filenames, stdin, resources and names, or by resources and label selector"),
-		Long:    delete_long,
-		Example: delete_example,
+		Short:                 i18n.T("Delete resources by filenames, stdin, resources and names, or by resources and label selector"),
+		Long:                  delete_long,
+		Example:               delete_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			o := deleteFlags.ToOptions(nil, streams)
 			cmdutil.CheckErr(o.Complete(f, args, cmd))

pkg/kubectl/cmd/delete_test.go

@@ -40,9 +40,9 @@ var unstructuredSerializer = resource.UnstructuredPlusDefaultContentConfig().Neg
 
 func fakecmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
+		Use:                   "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
 		DisableFlagsInUseLine: true,
-		Run: func(cmd *cobra.Command, args []string) {},
+		Run:                   func(cmd *cobra.Command, args []string) {},
 	}
 	return cmd
 }

pkg/kubectl/cmd/describe.go

@@ -101,11 +101,11 @@ func NewCmdDescribe(parent string, f cmdutil.Factory, streams genericclioptions.
 	}
 
 	cmd := &cobra.Command{
-		Use: "describe (-f FILENAME | TYPE [NAME_PREFIX | -l label] | TYPE/NAME)",
+		Use:                   "describe (-f FILENAME | TYPE [NAME_PREFIX | -l label] | TYPE/NAME)",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Show details of a specific resource or group of resources"),
-		Long:    describeLong + "\n\n" + cmdutil.SuggestApiResources(parent),
-		Example: describeExample,
+		Short:                 i18n.T("Show details of a specific resource or group of resources"),
+		Long:                  describeLong + "\n\n" + cmdutil.SuggestApiResources(parent),
+		Example:               describeExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Run())

pkg/kubectl/cmd/diff.go

@@ -78,11 +78,11 @@ func NewCmdDiff(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
 		IOStreams: streams,
 	}
 	cmd := &cobra.Command{
-		Use: "diff -f FILENAME",
+		Use:                   "diff -f FILENAME",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Diff live version against would-be applied version"),
-		Long:    diffLong,
-		Example: diffExample,
+		Short:                 i18n.T("Diff live version against would-be applied version"),
+		Long:                  diffLong,
+		Example:               diffExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(checkDiffArgs(cmd, args))
 			cmdutil.CheckErr(RunDiff(f, &diff, &options))

pkg/kubectl/cmd/drain.go

@@ -109,11 +109,11 @@ func NewCmdCordon(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cob
 	}
 
 	cmd := &cobra.Command{
-		Use: "cordon NODE",
+		Use:                   "cordon NODE",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Mark node as unschedulable"),
-		Long:    cordon_long,
-		Example: cordon_example,
+		Short:                 i18n.T("Mark node as unschedulable"),
+		Long:                  cordon_long,
+		Example:               cordon_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.RunCordonOrUncordon(true))
@@ -140,11 +140,11 @@ func NewCmdUncordon(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *c
 	}
 
 	cmd := &cobra.Command{
-		Use: "uncordon NODE",
+		Use:                   "uncordon NODE",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Mark node as schedulable"),
-		Long:    uncordon_long,
-		Example: uncordon_example,
+		Short:                 i18n.T("Mark node as schedulable"),
+		Long:                  uncordon_long,
+		Example:               uncordon_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.RunCordonOrUncordon(false))
@@ -202,11 +202,11 @@ func NewCmdDrain(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr
 	options := NewDrainOptions(f, ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "drain NODE",
+		Use:                   "drain NODE",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Drain node in preparation for maintenance"),
-		Long:    drain_long,
-		Example: drain_example,
+		Short:                 i18n.T("Drain node in preparation for maintenance"),
+		Long:                  drain_long,
+		Example:               drain_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.Complete(f, cmd, args))
 			cmdutil.CheckErr(options.RunDrain())

pkg/kubectl/cmd/edit.go

@@ -72,11 +72,11 @@ func NewCmdEdit(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra
 	o.ValidateOptions = cmdutil.ValidateOptions{EnableValidation: true}
 
 	cmd := &cobra.Command{
-		Use: "edit (RESOURCE/NAME | -f FILENAME)",
+		Use:                   "edit (RESOURCE/NAME | -f FILENAME)",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Edit a resource on the server"),
-		Long:    editLong,
-		Example: fmt.Sprintf(editExample),
+		Short:                 i18n.T("Edit a resource on the server"),
+		Long:                  editLong,
+		Example:               fmt.Sprintf(editExample),
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := o.Complete(f, args, cmd); err != nil {
 				cmdutil.CheckErr(err)

pkg/kubectl/cmd/exec.go

@@ -72,11 +72,11 @@ func NewCmdExec(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
 		Executor: &DefaultRemoteExecutor{},
 	}
 	cmd := &cobra.Command{
-		Use: "exec POD [-c CONTAINER] -- COMMAND [args...]",
+		Use:                   "exec POD [-c CONTAINER] -- COMMAND [args...]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Execute a command in a container"),
-		Long:    "Execute a command in a container.",
-		Example: exec_example,
+		Short:                 i18n.T("Execute a command in a container"),
+		Long:                  "Execute a command in a container.",
+		Example:               exec_example,
 		Run: func(cmd *cobra.Command, args []string) {
 			argsLenAtDash := cmd.ArgsLenAtDash()
 			cmdutil.CheckErr(options.Complete(f, cmd, args, argsLenAtDash))

pkg/kubectl/cmd/explain.go

@@ -74,11 +74,11 @@ func NewCmdExplain(parent string, f cmdutil.Factory, streams genericclioptions.I
 	o := NewExplainOptions(parent, streams)
 
 	cmd := &cobra.Command{
-		Use: "explain RESOURCE",
+		Use:                   "explain RESOURCE",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Documentation of resources"),
-		Long:    explainLong + "\n\n" + cmdutil.SuggestApiResources(parent),
-		Example: explainExamples,
+		Short:                 i18n.T("Documentation of resources"),
+		Long:                  explainLong + "\n\n" + cmdutil.SuggestApiResources(parent),
+		Example:               explainExamples,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(o.Validate(args))

pkg/kubectl/cmd/expose.go

@@ -126,11 +126,11 @@ func NewCmdExposeService(f cmdutil.Factory, streams genericclioptions.IOStreams)
 	}
 
 	cmd := &cobra.Command{
-		Use: "expose (-f FILENAME | TYPE NAME) [--port=port] [--protocol=TCP|UDP|SCTP] [--target-port=number-or-name] [--name=name] [--external-ip=external-ip-of-service] [--type=type]",
+		Use:                   "expose (-f FILENAME | TYPE NAME) [--port=port] [--protocol=TCP|UDP|SCTP] [--target-port=number-or-name] [--name=name] [--external-ip=external-ip-of-service] [--type=type]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service"),
-		Long:    exposeLong,
-		Example: exposeExample,
+		Short:                 i18n.T("Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service"),
+		Long:                  exposeLong,
+		Example:               exposeExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd))
 			cmdutil.CheckErr(o.RunExpose(cmd, args))

pkg/kubectl/cmd/get/get.go

@@ -150,11 +150,11 @@ func NewCmdGet(parent string, f cmdutil.Factory, streams genericclioptions.IOStr
 	o := NewGetOptions(parent, streams)
 
 	cmd := &cobra.Command{
-		Use: "get [(-o|--output=)json|yaml|wide|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=...] (TYPE[.VERSION][.GROUP] [NAME | -l label] | TYPE[.VERSION][.GROUP]/NAME ...) [flags]",
+		Use:                   "get [(-o|--output=)json|yaml|wide|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=...] (TYPE[.VERSION][.GROUP] [NAME | -l label] | TYPE[.VERSION][.GROUP]/NAME ...) [flags]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Display one or many resources"),
-		Long:    getLong + "\n\n" + cmdutil.SuggestApiResources(parent),
-		Example: getExample,
+		Short:                 i18n.T("Display one or many resources"),
+		Long:                  getLong + "\n\n" + cmdutil.SuggestApiResources(parent),
+		Example:               getExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate(cmd))

pkg/kubectl/cmd/help.go

@@ -31,10 +31,10 @@ var helpLong = templates.LongDesc(i18n.T(`
 
 func NewCmdHelp() *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "help [command] | STRING_TO_SEARCH",
+		Use:                   "help [command] | STRING_TO_SEARCH",
 		DisableFlagsInUseLine: true,
-		Short: i18n.T("Help about any command"),
-		Long:  helpLong,
+		Short:                 i18n.T("Help about any command"),
+		Long:                  helpLong,
 
 		Run: RunHelp,
 	}

pkg/kubectl/cmd/label.go

@@ -125,11 +125,11 @@ func NewCmdLabel(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr
 	o := NewLabelOptions(ioStreams)
 
 	cmd := &cobra.Command{
-		Use: "label [--overwrite] (-f FILENAME | TYPE NAME) KEY_1=VAL_1 ... KEY_N=VAL_N [--resource-version=version]",
+		Use:                   "label [--overwrite] (-f FILENAME | TYPE NAME) KEY_1=VAL_1 ... KEY_N=VAL_N [--resource-version=version]",
 		DisableFlagsInUseLine: true,
-		Short:   i18n.T("Update the labels on a resource"),
-		Long:    fmt.Sprintf(labelLong, validation.LabelValueMaxLength),
-		Example: labelExample,
+		Short:                 i18n.T("Update the labels on a resource"),
+		Long:                  fmt.Sprintf(labelLong, validation.LabelValueMaxLength),
+		Example:               labelExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(o.Complete(f, cmd, args))
 			cmdutil.CheckErr(o.Validate())