refactor: move annotations subcommand to correct location

plugins/scheduler-k3s/Makefile

@@ -1,4 +1,4 @@
-SUBCOMMANDS = subcommands/initialize subcommands/cluster-add subcommands/cluster-list subcommands/cluster-remove subcommands/report subcommands/set subcommands/show-kubeconfig subcommands/uninstall
+SUBCOMMANDS = subcommands/annotations:set subcommands/cluster-add subcommands/cluster-list subcommands/cluster-remove subcommands/initialize subcommands/report subcommands/set subcommands/show-kubeconfig subcommands/uninstall
 TRIGGERS = triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report triggers/scheduler-deploy triggers/scheduler-enter triggers/scheduler-logs triggers/scheduler-post-delete triggers/scheduler-run triggers/scheduler-run-list triggers/scheduler-stop
 BUILD = commands subcommands triggers
 PLUGIN_NAME = scheduler-k3s

plugins/scheduler-k3s/src/commands/commands.go

@@ -7,9 +7,6 @@ import (
 	"strings"
 
 	"github.com/dokku/dokku/plugins/common"
-	scheduler_k3s "github.com/dokku/dokku/plugins/scheduler-k3s"
-
-	flag "github.com/spf13/pflag"
 )
 
 const (
@@ -50,28 +47,6 @@ func main() {
 		} else {
 			fmt.Print("\n    scheduler-k3s, Manage scheduler-k3s settings for an app\n")
 		}
-	case "scheduler-k3s:annotations:set":
-		args := flag.NewFlagSet("scheduler-k3s:annotations:set", flag.ExitOnError)
-		global := args.Bool("global", false, "--global: set a global property")
-		processType := args.String("process-type", "", "--process-type: scope to process-type")
-		resourceType := args.String("resource-type", "", "--resource-type: scope to resource-type")
-		err := args.Parse(os.Args[2:])
-		if err != nil {
-			common.LogFailWithError(err)
-		}
-
-		appName := args.Arg(0)
-		property := args.Arg(1)
-		value := args.Arg(2)
-		if *global {
-			appName = "--global"
-			property = args.Arg(0)
-			value = args.Arg(1)
-		}
-
-		if err := scheduler_k3s.CommandAnnotationsSet(appName, *processType, *resourceType, property, value); err != nil {
-			common.LogFailWithError(err)
-		}
 	default:
 		dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT"))
 		if err != nil {

plugins/scheduler-k3s/src/subcommands/subcommands.go

@@ -18,13 +18,22 @@ func main() {
 
 	var err error
 	switch subcommand {
-	case "initialize":
+	case "annotations:set":
-		args := flag.NewFlagSet("scheduler-k3s:initialize", flag.ExitOnError)
+		args := flag.NewFlagSet("scheduler-k3s:annotations:set", flag.ExitOnError)
-		taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads")
+		global := args.Bool("global", false, "--global: set a global property")
-		serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node")
+		processType := args.String("process-type", "", "--process-type: scope to process-type")
-		ingressClass := args.String("ingress-class", "traefik", "ingress-class: ingress-class to use for all outbound traffic")
+		resourceType := args.String("resource-type", "", "--resource-type: scope to resource-type")
 		args.Parse(os.Args[2:])
-		err = scheduler_k3s.CommandInitialize(*ingressClass, *serverIP, *taintScheduling)
+		appName := args.Arg(0)
+		property := args.Arg(1)
+		value := args.Arg(2)
+		if *global {
+			appName = "--global"
+			property = args.Arg(0)
+			value = args.Arg(1)
+		}
+
+		err = scheduler_k3s.CommandAnnotationsSet(appName, *processType, *resourceType, property, value)
 	case "cluster-add":
 		args := flag.NewFlagSet("scheduler-k3s:cluster-add", flag.ExitOnError)
 		allowUknownHosts := args.Bool("insecure-allow-unknown-hosts", false, "insecure-allow-unknown-hosts: allow unknown hosts")
@@ -44,6 +53,13 @@ func main() {
 		args.Parse(os.Args[2:])
 		nodeName := args.Arg(0)
 		err = scheduler_k3s.CommandClusterRemove(nodeName)
+	case "initialize":
+		args := flag.NewFlagSet("scheduler-k3s:initialize", flag.ExitOnError)
+		taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads")
+		serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node")
+		ingressClass := args.String("ingress-class", "traefik", "ingress-class: ingress-class to use for all outbound traffic")
+		args.Parse(os.Args[2:])
+		err = scheduler_k3s.CommandInitialize(*ingressClass, *serverIP, *taintScheduling)
 	case "report":
 		args := flag.NewFlagSet("scheduler-k3s:report", flag.ExitOnError)
 		format := args.String("format", "stdout", "format: [ stdout | json ]")