b2af034e57
This implementation creates named references between an airship
config file , and a user specified or system default kubeconfig file
airshipconfig location can be specified via an envirnment variable
or via
--airshipconf string Path to file for airshipctl configuration.
(default ".airship/config")
kubeconfig has to be explicitly stated using the argument below
--kubeconfig string Path to kubeconfig associated with airshipctl
configuration. (default ".airship/kubeconfig")
if the argument is not specified a default empty kubeconfig will be
used using the default ".airship/kubeconfig"
All subcommands exposed via airshipctl config will update airship
config and airship related kubeconfig
when appropriate.
This patchset adds :
- Config Struct (type)
- config cmd and pkg
- get_cluster : List a specific name cluster or
List all clusters if no name is provided.
- set-cluster : Create or Modify an existing cluster.
Review comment fixes as of Pathset 19
- Moved core functionality from cmd to pkg
- Encapsulate cmd needs in pck in nw files cmds, cmds_types and cmds_test .
Expectation is that other functions will need func an structs there.
- added test for GetCluster
- Added GetCluster method to config object to be used by get_cluster command
- Change ClusterNames func as per review suggestion
- Change TestEmpty Cluster to avoid pointing to non test kubecnfig by default
- Change constant AirshipConfigFilePath to AirshipConfigDir
- Renamed config_utils to utils
- Added config cmd output tests
- Changes to settings_test.go to clean after itself.
- Created new pkg/config/testdata/GoldenString for struct data comparison values to avoid confusion
- Fix small get_cluster no name issue when empty config
- Fix issue when reconciling a cluster info that only exists in airship config and not in kubeconfig
Increased coverage to: SUCCESS: Test coverage is at 84.2%,
Started to move all testdata to a single place under pkg/config for now.
Change-Id: I7aae1f15afaebc99407f7fabccecf86ab0923bc3
70 lines
2.3 KiB
Go
70 lines
2.3 KiB
Go
package cmd
|
|
|
|
import (
|
|
"io"
|
|
|
|
//argo "github.com/argoproj/argo/cmd/argo/commands"
|
|
"github.com/spf13/cobra"
|
|
|
|
//kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/cmd"
|
|
kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
|
|
|
|
// Import to initialize client auth plugins.
|
|
_ "k8s.io/client-go/plugin/pkg/client/auth"
|
|
|
|
"opendev.org/airship/airshipctl/cmd/bootstrap"
|
|
"opendev.org/airship/airshipctl/cmd/cluster"
|
|
"opendev.org/airship/airshipctl/cmd/completion"
|
|
"opendev.org/airship/airshipctl/cmd/config"
|
|
"opendev.org/airship/airshipctl/cmd/document"
|
|
"opendev.org/airship/airshipctl/pkg/environment"
|
|
"opendev.org/airship/airshipctl/pkg/log"
|
|
)
|
|
|
|
// NewAirshipCTLCommand creates a root `airshipctl` command with the default commands attached
|
|
func NewAirshipCTLCommand(out io.Writer) (*cobra.Command, *environment.AirshipCTLSettings, error) {
|
|
rootCmd, settings, err := NewRootCmd(out)
|
|
return AddDefaultAirshipCTLCommands(rootCmd, settings), settings, err
|
|
}
|
|
|
|
// NewRootCmd creates the root `airshipctl` command. All other commands are
|
|
// subcommands branching from this one
|
|
func NewRootCmd(out io.Writer) (*cobra.Command, *environment.AirshipCTLSettings, error) {
|
|
settings := &environment.AirshipCTLSettings{}
|
|
rootCmd := &cobra.Command{
|
|
Use: "airshipctl",
|
|
Short: "airshipctl is a unified entrypoint to various airship components",
|
|
SilenceErrors: true,
|
|
SilenceUsage: true,
|
|
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
|
log.Init(settings.Debug, cmd.OutOrStderr())
|
|
|
|
},
|
|
}
|
|
rootCmd.SetOutput(out)
|
|
rootCmd.AddCommand(NewVersionCommand())
|
|
|
|
settings.InitFlags(rootCmd)
|
|
// Load or Initialize airship Config
|
|
settings.InitConfig()
|
|
|
|
return rootCmd, settings, nil
|
|
}
|
|
|
|
// AddDefaultAirshipCTLCommands is a convenience function for adding all of the
|
|
// default commands to airshipctl
|
|
func AddDefaultAirshipCTLCommands(cmd *cobra.Command, settings *environment.AirshipCTLSettings) *cobra.Command {
|
|
//cmd.AddCommand(argo.NewCommand())
|
|
cmd.AddCommand(bootstrap.NewBootstrapCommand(settings))
|
|
cmd.AddCommand(cluster.NewClusterCommand(settings))
|
|
cmd.AddCommand(completion.NewCompletionCommand())
|
|
cmd.AddCommand(document.NewDocumentCommand(settings))
|
|
cmd.AddCommand(config.NewConfigCommand(settings))
|
|
|
|
cmd.AddCommand(kubectl.NewDefaultKubectlCommand())
|
|
// Should we use cmd.OutOrStdout?
|
|
//cmd.AddCommand(kubeadm.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr))
|
|
|
|
return cmd
|
|
}
|