Sane usage of the default cluster name
- use by default whereever clustername is required as an arg (if nArgs is 0) - use by default whereever clustername is expected as flag
This commit is contained in:
parent
9332f32ead
commit
81ba7200f4
@ -62,9 +62,6 @@ func NewCmdCreateNode() *cobra.Command {
|
|||||||
log.Fatalln("Failed to register flag completion for '--role'", err)
|
log.Fatalln("Failed to register flag completion for '--role'", err)
|
||||||
}
|
}
|
||||||
cmd.Flags().StringP("cluster", "c", k3d.DefaultClusterName, "Select the cluster that the node shall connect to.")
|
cmd.Flags().StringP("cluster", "c", k3d.DefaultClusterName, "Select the cluster that the node shall connect to.")
|
||||||
if err := cmd.MarkFlagRequired("cluster"); err != nil {
|
|
||||||
log.Fatalln("Failed to mark required flag '--cluster'")
|
|
||||||
}
|
|
||||||
if err := cmd.RegisterFlagCompletionFunc("cluster", util.ValidArgsAvailableClusters); err != nil {
|
if err := cmd.RegisterFlagCompletionFunc("cluster", util.ValidArgsAvailableClusters); err != nil {
|
||||||
log.Fatalln("Failed to register flag completion for '--cluster'", err)
|
log.Fatalln("Failed to register flag completion for '--cluster'", err)
|
||||||
}
|
}
|
||||||
|
@ -41,10 +41,10 @@ func NewCmdDeleteCluster() *cobra.Command {
|
|||||||
|
|
||||||
// create new cobra command
|
// create new cobra command
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "cluster (NAME | --all)",
|
Use: "cluster [NAME [NAME ...] | --all]",
|
||||||
Short: "Delete a cluster.",
|
Short: "Delete cluster(s).",
|
||||||
Long: `Delete a cluster.`,
|
Long: `Delete cluster(s).`,
|
||||||
Args: cobra.MinimumNArgs(0), // 0 or n arguments; 0 only if --all is set
|
Args: cobra.MinimumNArgs(0), // 0 or n arguments; 0 = default cluster name
|
||||||
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
clusters := parseDeleteClusterCmd(cmd, args)
|
clusters := parseDeleteClusterCmd(cmd, args)
|
||||||
@ -106,11 +106,12 @@ func parseDeleteClusterCmd(cmd *cobra.Command, args []string) []*k3d.Cluster {
|
|||||||
return clusters
|
return clusters
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args) < 1 {
|
clusternames := []string{k3d.DefaultClusterName}
|
||||||
log.Fatalln("Expecting at least one cluster name if `--all` is not set")
|
if len(args) != 0 {
|
||||||
|
clusternames = args
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, name := range args {
|
for _, name := range clusternames {
|
||||||
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
|
@ -57,12 +57,7 @@ func NewCmdGetKubeconfig() *cobra.Command {
|
|||||||
Short: "Get kubeconfig",
|
Short: "Get kubeconfig",
|
||||||
Long: `Get kubeconfig.`,
|
Long: `Get kubeconfig.`,
|
||||||
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
||||||
Args: func(cmd *cobra.Command, args []string) error {
|
Args: cobra.MinimumNArgs(0),
|
||||||
if (len(args) < 1 && !getKubeconfigFlags.all) || (len(args) > 0 && getKubeconfigFlags.all) {
|
|
||||||
return fmt.Errorf("Need to specify one or more cluster names *or* set `--all` flag")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
var clusters []*k3d.Cluster
|
var clusters []*k3d.Cluster
|
||||||
var err error
|
var err error
|
||||||
@ -78,7 +73,13 @@ func NewCmdGetKubeconfig() *cobra.Command {
|
|||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for _, clusterName := range args {
|
|
||||||
|
clusternames := []string{k3d.DefaultClusterName}
|
||||||
|
if len(args) != 0 {
|
||||||
|
clusternames = args
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, clusterName := range clusternames {
|
||||||
retrievedCluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: clusterName})
|
retrievedCluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: clusterName})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
|
@ -42,9 +42,9 @@ func NewCmdStartCluster() *cobra.Command {
|
|||||||
|
|
||||||
// create new command
|
// create new command
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "cluster (NAME [NAME...] | --all)",
|
Use: "cluster [NAME [NAME...] | --all]",
|
||||||
Short: "Start an existing k3d cluster",
|
Long: `Start existing k3d cluster(s)`,
|
||||||
Long: `Start an existing k3d cluster`,
|
Short: "Start existing k3d cluster(s)",
|
||||||
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
clusters := parseStartClusterCmd(cmd, args)
|
clusters := parseStartClusterCmd(cmd, args)
|
||||||
@ -86,11 +86,12 @@ func parseStartClusterCmd(cmd *cobra.Command, args []string) []*k3d.Cluster {
|
|||||||
return clusters
|
return clusters
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args) < 1 {
|
clusternames := []string{k3d.DefaultClusterName}
|
||||||
log.Fatalln("Expecting at least one cluster name if `--all` is not set")
|
if len(args) != 0 {
|
||||||
|
clusternames = args
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, name := range args {
|
for _, name := range clusternames {
|
||||||
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
|
@ -37,9 +37,9 @@ func NewCmdStopCluster() *cobra.Command {
|
|||||||
|
|
||||||
// create new command
|
// create new command
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "cluster (NAME [NAME...] | --all)",
|
Use: "cluster [NAME [NAME...] | --all]",
|
||||||
Short: "Stop an existing k3d cluster",
|
Short: "Stop existing k3d cluster(s)",
|
||||||
Long: `Stop an existing k3d cluster.`,
|
Long: `Stop existing k3d cluster(s).`,
|
||||||
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
ValidArgsFunction: util.ValidArgsAvailableClusters,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
clusters := parseStopClusterCmd(cmd, args)
|
clusters := parseStopClusterCmd(cmd, args)
|
||||||
@ -79,11 +79,12 @@ func parseStopClusterCmd(cmd *cobra.Command, args []string) []*k3d.Cluster {
|
|||||||
return clusters
|
return clusters
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args) < 1 {
|
clusternames := []string{k3d.DefaultClusterName}
|
||||||
log.Fatalln("Expecting at least one cluster name if `--all` is not set")
|
if len(args) != 0 {
|
||||||
|
clusternames = args
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, name := range args {
|
for _, name := range clusternames {
|
||||||
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
cluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: name})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
|
Loading…
Reference in New Issue
Block a user