github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-23 02:26:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix golint issues

Browse Source
This commit is contained in:
Lucas Käldström 2017-02-23 23:44:46 +02:00
parent 69c24afc20
commit 036463dd17
No known key found for this signature in database
GPG Key ID: 3FA3783D77751514
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/cmd/phases/kubeconfig.go
View File

@ -40,7 +40,7 @@ func NewCmdKubeConfig(out io.Writer) *cobra.Command {
} }
func NewCmdToken(out io.Writer) *cobra.Command { func NewCmdToken(out io.Writer) *cobra.Command {
config := &kubeconfigphase.KubeConfigProperties{ config := &kubeconfigphase.BuildConfigProperties{
MakeClientCerts: false, MakeClientCerts: false,
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
@ -57,7 +57,7 @@ func NewCmdToken(out io.Writer) *cobra.Command {
} }
func NewCmdClientCerts(out io.Writer) *cobra.Command { func NewCmdClientCerts(out io.Writer) *cobra.Command {
config := &kubeconfigphase.KubeConfigProperties{ config := &kubeconfigphase.BuildConfigProperties{
MakeClientCerts: true, MakeClientCerts: true,
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
@ -73,13 +73,13 @@ func NewCmdClientCerts(out io.Writer) *cobra.Command {
return cmd return cmd
} }
func addCommonFlags(cmd *cobra.Command, config *kubeconfigphase.KubeConfigProperties) { func addCommonFlags(cmd *cobra.Command, config *kubeconfigphase.BuildConfigProperties) {
cmd.Flags().StringVar(&config.CertDir, "cert-dir", kubeadmconstants.DefaultCertDir, "The path to the directory where the certificates are.") cmd.Flags().StringVar(&config.CertDir, "cert-dir", kubeadmconstants.DefaultCertDir, "The path to the directory where the certificates are.")
cmd.Flags().StringVar(&config.ClientName, "client-name", "", "The name of the client for which the KubeConfig file will be generated.") cmd.Flags().StringVar(&config.ClientName, "client-name", "", "The name of the client for which the KubeConfig file will be generated.")
cmd.Flags().StringVar(&config.APIServer, "server", "", "The location of the api server.") cmd.Flags().StringVar(&config.APIServer, "server", "", "The location of the api server.")
} }
func validateCommonFlags(config *kubeconfigphase.KubeConfigProperties) error { func validateCommonFlags(config *kubeconfigphase.BuildConfigProperties) error {
if len(config.ClientName) == 0 { if len(config.ClientName) == 0 {
return fmt.Errorf("The --client-name flag is required") return fmt.Errorf("The --client-name flag is required")
} }
@ -90,7 +90,7 @@ func validateCommonFlags(config *kubeconfigphase.KubeConfigProperties) error {
} }
// RunCreateWithToken generates a kubeconfig file from with a token as the authentication mechanism // RunCreateWithToken generates a kubeconfig file from with a token as the authentication mechanism
func RunCreateWithToken(out io.Writer, config *kubeconfigphase.KubeConfigProperties) error { func RunCreateWithToken(out io.Writer, config *kubeconfigphase.BuildConfigProperties) error {
if len(config.Token) == 0 { if len(config.Token) == 0 {
return fmt.Errorf("The --token flag is required") return fmt.Errorf("The --token flag is required")
} }
@ -106,7 +106,7 @@ func RunCreateWithToken(out io.Writer, config *kubeconfigphase.KubeConfigPropert
} }
// RunCreateWithClientCerts generates a kubeconfig file from with client certs as the authentication mechanism // RunCreateWithClientCerts generates a kubeconfig file from with client certs as the authentication mechanism
func RunCreateWithClientCerts(out io.Writer, config *kubeconfigphase.KubeConfigProperties) error { func RunCreateWithClientCerts(out io.Writer, config *kubeconfigphase.BuildConfigProperties) error {
if err := validateCommonFlags(config); err != nil { if err := validateCommonFlags(config); err != nil {
return err return err
} }

10
cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
View File

@ -31,7 +31,8 @@ import (
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
) )
type KubeConfigProperties struct { // BuildConfigProperties holds some simple information about how this phase should build the KubeConfig object
type BuildConfigProperties struct {
CertDir string CertDir string
ClientName string ClientName string
Organization []string Organization []string
@ -59,7 +60,7 @@ func CreateInitKubeConfigFiles(masterEndpoint, pkiDir, outDir string) error {
} }
// Create a lightweight specification for what the files should look like // Create a lightweight specification for what the files should look like
filesToCreateFromSpec := map[string]KubeConfigProperties{ filesToCreateFromSpec := map[string]BuildConfigProperties{
kubeadmconstants.AdminKubeConfigFileName: { kubeadmconstants.AdminKubeConfigFileName: {
ClientName: "kubernetes-admin", ClientName: "kubernetes-admin",
APIServer: masterEndpoint, APIServer: masterEndpoint,
@ -105,7 +106,8 @@ func CreateInitKubeConfigFiles(masterEndpoint, pkiDir, outDir string) error {
return nil return nil
} }
func GetKubeConfigBytesFromSpec(config KubeConfigProperties) ([]byte, error) { // GetKubeConfigBytesFromSpec takes properties how to build a KubeConfig file and then returns the bytes of that file
func GetKubeConfigBytesFromSpec(config BuildConfigProperties) ([]byte, error) {
kubeconfig, err := buildKubeConfig(config) kubeconfig, err := buildKubeConfig(config)
if err != nil { if err != nil {
return []byte{}, err return []byte{}, err
@ -119,7 +121,7 @@ func GetKubeConfigBytesFromSpec(config KubeConfigProperties) ([]byte, error) {
} }
// buildKubeConfig creates a kubeconfig object from some commonly specified properties in the struct above // buildKubeConfig creates a kubeconfig object from some commonly specified properties in the struct above
func buildKubeConfig(config KubeConfigProperties) (*clientcmdapi.Config, error) { func buildKubeConfig(config BuildConfigProperties) (*clientcmdapi.Config, error) {
// Try to load ca.crt and ca.key from the PKI directory // Try to load ca.crt and ca.key from the PKI directory
caCert, caKey, err := pkiutil.TryLoadCertAndKeyFromDisk(config.CertDir, kubeadmconstants.CACertAndKeyBaseName) caCert, caKey, err := pkiutil.TryLoadCertAndKeyFromDisk(config.CertDir, kubeadmconstants.CACertAndKeyBaseName)