Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ commands you run:
|---|---|
| `helm` (3.8+) | `deploy render` |
| `git` | `deploy init`, `deploy render` |
| `argo` | `node enroll-server`, `node inspect-server` |
| `argo` | `workflow enroll-server`, `workflow enroll-netdev`, `workflow enroll-fw`, `workflow inspect-server`, `workflow list` |
| `kubectl` / a valid kubeconfig | anything that talks to a cluster |

## Development
Expand Down
69 changes: 0 additions & 69 deletions cmd/node/inspect.go

This file was deleted.

35 changes: 0 additions & 35 deletions cmd/node/inspect_test.go

This file was deleted.

16 changes: 0 additions & 16 deletions cmd/node/node.go

This file was deleted.

4 changes: 2 additions & 2 deletions cmd/root/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/rackerlabs/understackctl/cmd/deviceType"
"github.com/rackerlabs/understackctl/cmd/flavor"
"github.com/rackerlabs/understackctl/cmd/nautobotOp"
"github.com/rackerlabs/understackctl/cmd/node"
cmdversion "github.com/rackerlabs/understackctl/cmd/version"
"github.com/rackerlabs/understackctl/cmd/workflow"
"github.com/rackerlabs/understackctl/internal/version"
"github.com/spf13/cobra"
)
Expand All @@ -29,7 +29,7 @@ func init() {
rootCmd.AddCommand(deviceType.NewCmdDeviceType())
rootCmd.AddCommand(flavor.NewCmdFlavor())
rootCmd.AddCommand(nautobotOp.NewCmdNautobotOp())
rootCmd.AddCommand(node.NewCmdNode())
rootCmd.AddCommand(workflow.NewCmdWorkflow())
rootCmd.AddCommand(cmdversion.NewCmdVersion())
}

Expand Down
67 changes: 29 additions & 38 deletions cmd/node/enroll.go → cmd/workflow/enroll.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package node
package workflow

import (
"fmt"
"net"
"os"
"os/exec"
"strings"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -43,24 +41,7 @@ func newCmdEnrollServer() *cobra.Command {
return err
}

currentContext, err := currentKubeContext()
if err != nil {
return fmt.Errorf("get current Kubernetes context: %w", err)
}

cmd.Printf("Kubernetes context: %s\n", currentContext)
cmd.Printf("Running: %s\n", shellQuoteCommand("argo", argoArgs))

argoCmd := exec.Command("argo", argoArgs...)
argoCmd.Stdin = os.Stdin
argoCmd.Stdout = cmd.OutOrStdout()
argoCmd.Stderr = cmd.ErrOrStderr()

if err := argoCmd.Run(); err != nil {
return fmt.Errorf("run argo enroll workflow: %w", err)
}

return nil
return submitWorkflow(cmd, argoArgs, ipAddress, opts.Logs)
},
}

Expand All @@ -74,34 +55,25 @@ func newCmdEnrollServer() *cobra.Command {
}

func buildEnrollArgoArgs(cmd *cobra.Command, ipAddress string, opts *enrollOptions) ([]string, error) {
args := []string{
"-n", enrollWorkflowNamespace,
"submit",
"--from", enrollWorkflowTemplate,
"-p", fmt.Sprintf("ip_address=%s", ipAddress),
}

if opts.Logs {
args = append(args, "--log")
}
params := []string{fmt.Sprintf("ip_address=%s", ipAddress)}

if cmd.Flags().Changed("old-password") {
args = append(args, "-p", fmt.Sprintf("old_password=%s", opts.OldPassword))
params = append(params, fmt.Sprintf("old_password=%s", opts.OldPassword))
}

if cmd.Flags().Changed("firmware-update") {
args = append(args, "-p", fmt.Sprintf("firmware_update=%t", opts.FirmwareUpdate))
params = append(params, fmt.Sprintf("firmware_update=%t", opts.FirmwareUpdate))
}

if cmd.Flags().Changed("raid-configure") {
args = append(args, "-p", fmt.Sprintf("raid_configure=%t", opts.RaidConfigure))
params = append(params, fmt.Sprintf("raid_configure=%t", opts.RaidConfigure))
}

if cmd.Flags().Changed("external-cmdb-id") {
args = append(args, "-p", fmt.Sprintf("external_cmdb_id=%s", opts.ExternalCMDBID))
params = append(params, fmt.Sprintf("external_cmdb_id=%s", opts.ExternalCMDBID))
}

return args, nil
return buildSubmitArgs(enrollWorkflowTemplate, params...), nil
}

func currentKubeContext() (string, error) {
Expand All @@ -117,9 +89,28 @@ func currentKubeContext() (string, error) {
return config.CurrentContext, nil
}

// currentKubeServer returns the API server URL of the current context's cluster.
func currentKubeServer() (string, error) {
config, err := clientcmd.NewDefaultPathOptions().GetStartingConfig()
if err != nil {
return "", err
}

ctx, ok := config.Contexts[config.CurrentContext]
if !ok {
return "", fmt.Errorf("current context %q not found", config.CurrentContext)
}

cluster, ok := config.Clusters[ctx.Cluster]
if !ok {
return "", fmt.Errorf("cluster %q not found", ctx.Cluster)
}

return cluster.Server, nil
}

func shellQuoteCommand(name string, args []string) string {
parts := make([]string, 0, len(args)+1)
parts = append(parts, shellQuote(name))
parts := []string{shellQuote(name)}
for _, arg := range args {
parts = append(parts, shellQuote(arg))
}
Expand Down
Loading
Loading