Add flag for providing credentials file

pkg/cmd/install.go

@@ -59,6 +59,7 @@ It's possible to source information about hosts from Terraform output, using the
 			logger := initLogger(gopts.Verbose)
 			iopts.TerraformState = gopts.TerraformState
 			iopts.Verbose = gopts.Verbose
+			iopts.CredentialsFilePath = gopts.CredentialsFilePath
 
 			iopts.Manifest = args[0]
 			if iopts.Manifest == "" {
@@ -114,7 +115,8 @@ func createInstallerOptions(clusterFile string, cluster *kubeoneapi.KubeOneClust
 	defer f.Close()
 
 	return &installer.Options{
-		BackupFile: options.BackupFile,
-		Verbose:    options.Verbose,
+		CredentialsFile: options.CredentialsFilePath,
+		BackupFile:      options.BackupFile,
+		Verbose:         options.Verbose,
 	}, nil
 }

pkg/cmd/reset.go

@@ -81,9 +81,10 @@ func runReset(logger *logrus.Logger, resetOptions *resetOptions) error {
 	}
 
 	options := &installer.Options{
-		Verbose:        resetOptions.Verbose,
-		DestroyWorkers: resetOptions.DestroyWorkers,
-		RemoveBinaries: resetOptions.RemoveBinaries,
+		Verbose:         resetOptions.Verbose,
+		CredentialsFile: resetOptions.CredentialsFilePath,
+		DestroyWorkers:  resetOptions.DestroyWorkers,
+		RemoveBinaries:  resetOptions.RemoveBinaries,
 	}
 
 	return installer.NewInstaller(cluster, logger).Reset(options)

pkg/cmd/root.go

@@ -75,6 +75,7 @@ func newRoot() *cobra.Command {
 
 	fs.StringVarP(&opts.TerraformState, globalTerraformFlagName, "t", "",
 		"Source for terrafor output JSON. - to read from stdin. If path is file, contents will be used. If path is dictionary, `terraform output -json` is executed in this path")
+	fs.StringVarP(&opts.CredentialsFilePath, globalCredentialsFlagName, "c", "", "File to source credentials and secrets from")
 	fs.BoolVarP(&opts.Verbose, globalVerboseFlagName, "v", false, "verbose")
 	fs.BoolVarP(&opts.Debug, globalDebugFlagName, "d", false, "debug")
 

pkg/cmd/shared.go

@@ -26,16 +26,18 @@ import (
 )
 
 const (
-	globalTerraformFlagName = "tfjson"
-	globalVerboseFlagName   = "verbose"
-	globalDebugFlagName     = "debug"
+	globalTerraformFlagName   = "tfjson"
+	globalCredentialsFlagName = "credentials"
+	globalVerboseFlagName     = "verbose"
+	globalDebugFlagName       = "debug"
 )
 
 // globalOptions are global globalOptions same for all commands
 type globalOptions struct {
-	TerraformState string
-	Verbose        bool
-	Debug          bool
+	TerraformState      string
+	CredentialsFilePath string
+	Verbose             bool
+	Debug               bool
 }
 
 func persistentGlobalOptions(fs *pflag.FlagSet) (*globalOptions, error) {
@@ -49,9 +51,15 @@ func persistentGlobalOptions(fs *pflag.FlagSet) (*globalOptions, error) {
 		return nil, errors.WithStack(err)
 	}
 
+	creds, err := fs.GetString(globalCredentialsFlagName)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
 	return &globalOptions{
-		Verbose:        verbose,
-		TerraformState: tfjson,
+		Verbose:             verbose,
+		TerraformState:      tfjson,
+		CredentialsFilePath: creds,
 	}, nil
 }
 

pkg/cmd/upgrade.go

@@ -82,6 +82,7 @@ func runUpgrade(logger *logrus.Logger, upgradeOptions *upgradeOptions) error {
 
 func createUpgradeOptions(options *upgradeOptions) *upgrader.Options {
 	return &upgrader.Options{
+		CredentialsFile:           options.CredentialsFilePath,
 		ForceUpgrade:              options.ForceUpgrade,
 		Verbose:                   options.Verbose,
 		UpgradeMachineDeployments: options.UpgradeMachineDeployments,

pkg/installer/installer.go

@@ -29,10 +29,11 @@ import (
 // Options groups the various possible options for running
 // the Kubernetes installation.
 type Options struct {
-	Verbose        bool
-	BackupFile     string
-	DestroyWorkers bool
-	RemoveBinaries bool
+	Verbose         bool
+	CredentialsFile string
+	BackupFile      string
+	DestroyWorkers  bool
+	RemoveBinaries  bool
 }
 
 // Installer is entrypoint for installation process
@@ -68,14 +69,15 @@ func (i *Installer) Reset(options *Options) error {
 // structs for each task individually.
 func (i *Installer) createState(options *Options) *state.State {
 	return &state.State{
-		Cluster:        i.cluster,
-		Connector:      ssh.NewConnector(),
-		Configuration:  configupload.NewConfiguration(),
-		WorkDir:        "kubeone",
-		Logger:         i.logger,
-		Verbose:        options.Verbose,
-		BackupFile:     options.BackupFile,
-		DestroyWorkers: options.DestroyWorkers,
-		RemoveBinaries: options.RemoveBinaries,
+		Cluster:             i.cluster,
+		Connector:           ssh.NewConnector(),
+		Configuration:       configupload.NewConfiguration(),
+		WorkDir:             "kubeone",
+		Logger:              i.logger,
+		Verbose:             options.Verbose,
+		CredentialsFilePath: options.CredentialsFile,
+		BackupFile:          options.BackupFile,
+		DestroyWorkers:      options.DestroyWorkers,
+		RemoveBinaries:      options.RemoveBinaries,
 	}
 }

pkg/state/context.go

@@ -48,6 +48,7 @@ type State struct {
 	ForceUpgrade              bool
 	UpgradeMachineDeployments bool
 	PatchCNI                  bool
+	CredentialsFilePath       string
 }
 
 // Clone returns a shallow copy of the State.

pkg/upgrader/upgrader.go

@@ -28,6 +28,7 @@ import (
 
 // Options groups the various possible options for running KubeOne upgrade
 type Options struct {
+	CredentialsFile           string
 	ForceUpgrade              bool
 	UpgradeMachineDeployments bool
 	Verbose                   bool
@@ -64,5 +65,6 @@ func (u *Upgrader) createState(options *Options) *state.State {
 		Verbose:                   options.Verbose,
 		ForceUpgrade:              options.ForceUpgrade,
 		UpgradeMachineDeployments: options.UpgradeMachineDeployments,
+		CredentialsFilePath:       options.CredentialsFile,
 	}
 }