mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add clusterCreateOpts flag struct and implement extra args for k3s server/agent

Browse Source
This commit is contained in:
iwilltry42 2020-01-15 09:29:35 +01:00
parent 6001b5859b
commit a25d1d346a
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/create/createCluster.go
View File

@ -36,9 +36,17 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
// createClusterOpts describes a set of options set via CLI flags
type createClusterOpts struct {
K3sServerArgs []string
K3sAgentArgs []string
}
// NewCmdCreateCluster returns a new cobra command // NewCmdCreateCluster returns a new cobra command
func NewCmdCreateCluster() *cobra.Command { func NewCmdCreateCluster() *cobra.Command {
opts := &createClusterOpts{}
// create new command // create new command
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "cluster NAME", Use: "cluster NAME",
@ -46,7 +54,7 @@ func NewCmdCreateCluster() *cobra.Command {
Long: `Create a new k3s cluster with containerized nodes (k3s in docker).`, Long: `Create a new k3s cluster with containerized nodes (k3s in docker).`,
Args: cobra.ExactArgs(1), // exactly one cluster name can be set // TODO: if not specified, use k3d.DefaultClusterName Args: cobra.ExactArgs(1), // exactly one cluster name can be set // TODO: if not specified, use k3d.DefaultClusterName
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
runtime, cluster := parseCreateClusterCmd(cmd, args) runtime, cluster := parseCreateClusterCmd(cmd, args, opts)
if err := k3dCluster.CreateCluster(cluster, runtime); err != nil { if err := k3dCluster.CreateCluster(cluster, runtime); err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -90,8 +98,8 @@ func NewCmdCreateCluster() *cobra.Command {
*/ */
/* k3s */ // TODO: to implement extra args /* k3s */ // TODO: to implement extra args
cmd.Flags().StringArray("k3s-server-arg", nil, "[WIP] Additional args passed to the `k3s server` command on master nodes") cmd.Flags().StringArrayVar(&opts.K3sServerArgs, "k3s-server-arg", nil, "Additional args passed to the `k3s server` command on master nodes (new flag per arg)")
cmd.Flags().StringArray("k3s-agent-arg", nil, "[WIP] Additional args passed to the `k3s agent` command on worker nodes") cmd.Flags().StringArrayVar(&opts.K3sAgentArgs, "k3s-agent-arg", nil, "Additional args passed to the `k3s agent` command on worker nodes (new flag per arg)")
/* Subcommands */ /* Subcommands */
@ -100,7 +108,7 @@ func NewCmdCreateCluster() *cobra.Command {
} }
// parseCreateClusterCmd parses the command input into variables required to create a cluster // parseCreateClusterCmd parses the command input into variables required to create a cluster
func parseCreateClusterCmd(cmd *cobra.Command, args []string) (runtimes.Runtime, *k3d.Cluster) { func parseCreateClusterCmd(cmd *cobra.Command, args []string, opts *createClusterOpts) (runtimes.Runtime, *k3d.Cluster) {
// --runtime // --runtime
rt, err := cmd.Flags().GetString("runtime") rt, err := cmd.Flags().GetString("runtime")
if err != nil { if err != nil {
@ -333,6 +341,7 @@ func parseCreateClusterCmd(cmd *cobra.Command, args []string) (runtimes.Runtime,
node := k3d.Node{ node := k3d.Node{
Role: k3d.MasterRole, Role: k3d.MasterRole,
Image: image, Image: image,
Args: opts.K3sServerArgs,
MasterOpts: k3d.MasterOpts{}, MasterOpts: k3d.MasterOpts{},
} }
@ -354,6 +363,7 @@ func parseCreateClusterCmd(cmd *cobra.Command, args []string) (runtimes.Runtime,
node := k3d.Node{ node := k3d.Node{
Role: k3d.WorkerRole, Role: k3d.WorkerRole,
Image: image, Image: image,
Args: opts.K3sAgentArgs,
} }
cluster.Nodes = append(cluster.Nodes, &node) cluster.Nodes = append(cluster.Nodes, &node)