Move changes to cmd/options.go

internal/cmd/controller/gitops/operator.go

@@ -10,7 +10,6 @@ import (
 
 	command "github.com/rancher/fleet/internal/cmd"
 	"github.com/rancher/fleet/internal/cmd/controller/gitops/reconciler"
-	"github.com/rancher/fleet/internal/cmd/controller/options"
 	"github.com/rancher/fleet/internal/metrics"
 	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	"github.com/rancher/fleet/pkg/git/poll"
@@ -87,7 +86,7 @@ func (g *GitOperator) Run(cmd *cobra.Command, args []string) error {
 
 	namespace := g.Namespace
 
-	leaderOpts, err := options.NewLeaderElectionOptions()
+	leaderOpts, err := command.NewLeaderElectionOptions()
 	if err != nil {
 		return err
 	}

internal/cmd/controller/operator.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/reugn/go-quartz/quartz"
 
-	"github.com/rancher/fleet/internal/cmd/controller/options"
+	"github.com/rancher/fleet/internal/cmd"
 	"github.com/rancher/fleet/internal/cmd/controller/reconciler"
 	"github.com/rancher/fleet/internal/cmd/controller/target"
 	"github.com/rancher/fleet/internal/manifest"
@@ -36,7 +36,7 @@ func start(
 	ctx context.Context,
 	systemNamespace string,
 	config *rest.Config,
-	leaderOpts options.LeaderElectionOptions,
+	leaderOpts cmd.LeaderElectionOptions,
 	workersOpts ControllerReconcilerWorkers,
 	bindAddresses BindAddresses,
 	disableMetrics bool,

internal/cmd/controller/root.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement"
 	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/agent"
 	"github.com/rancher/fleet/internal/cmd/controller/gitops"
-	"github.com/rancher/fleet/internal/cmd/controller/options"
 
 	"github.com/spf13/cobra"
 
@@ -81,7 +80,7 @@ func (f *FleetManager) Run(cmd *cobra.Command, args []string) error {
 	kubeconfig := ctrl.GetConfigOrDie()
 	workersOpts := ControllerReconcilerWorkers{}
 
-	leaderOpts, err := options.NewLeaderElectionOptions()
+	leaderOpts, err := command.NewLeaderElectionOptions()
 	if err != nil {
 		return err
 	}

internal/cmd/controller/options/leaderelection.go → internal/cmd/options.go

@@ -1,4 +1,4 @@
-package options
+package cmd
 
 import (
 	"fmt"