diff --git a/internal/cli/wire_gen.go b/internal/cli/wire_gen.go index 456ad5f0a3..186d78ab7c 100644 --- a/internal/cli/wire_gen.go +++ b/internal/cli/wire_gen.go @@ -23,6 +23,7 @@ import ( "github.com/tilt-dev/tilt/internal/container" "github.com/tilt-dev/tilt/internal/containerupdate" "github.com/tilt-dev/tilt/internal/controllers" + "github.com/tilt-dev/tilt/internal/controllers/core/cmd" "github.com/tilt-dev/tilt/internal/controllers/core/filewatch" "github.com/tilt-dev/tilt/internal/docker" "github.com/tilt-dev/tilt/internal/dockercompose" @@ -183,7 +184,8 @@ func wireCmdUp(ctx context.Context, analytics3 *analytics.TiltAnalytics, cmdTags return CmdUpDeps{}, err } controller := filewatch.NewController(storeStore) - v := controllers.ProvideControllers(controller) + cmdController := cmd.NewController() + v := controllers.ProvideControllers(controller, cmdController) controllerBuilder := controllers.NewControllerBuilder(tiltServerControllerManager, v) v2 := provideClock() renderer := hud.NewRenderer(v2) @@ -353,7 +355,8 @@ func wireCmdCI(ctx context.Context, analytics3 *analytics.TiltAnalytics, subcomm return CmdCIDeps{}, err } controller := filewatch.NewController(storeStore) - v := controllers.ProvideControllers(controller) + cmdController := cmd.NewController() + v := controllers.ProvideControllers(controller, cmdController) controllerBuilder := controllers.NewControllerBuilder(tiltServerControllerManager, v) v2 := provideClock() renderer := hud.NewRenderer(v2) diff --git a/internal/controllers/core/cmd/controller.go b/internal/controllers/core/cmd/controller.go new file mode 100644 index 0000000000..ea2ce536ef --- /dev/null +++ b/internal/controllers/core/cmd/controller.go @@ -0,0 +1,30 @@ +package cmd + +import ( + "context" + + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +type Controller struct { + client.Client +} + +func NewController() *Controller { + return &Controller{} +} + +func (r *Controller) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { + return ctrl.Result{}, nil +} + +func (r *Controller) SetClient(client client.Client) { + r.Client = client +} + +func (r *Controller) SetupWithManager(mgr ctrl.Manager) error { + return ctrl.NewControllerManagedBy(mgr). + For(&Cmd{}). + Complete(r) +} diff --git a/internal/controllers/core/cmd/types.go b/internal/controllers/core/cmd/types.go new file mode 100644 index 0000000000..2d3c4c4281 --- /dev/null +++ b/internal/controllers/core/cmd/types.go @@ -0,0 +1,5 @@ +package cmd + +import "github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1" + +type Cmd = v1alpha1.Cmd diff --git a/internal/controllers/core/cmd/wire.go b/internal/controllers/core/cmd/wire.go new file mode 100644 index 0000000000..79565630bd --- /dev/null +++ b/internal/controllers/core/cmd/wire.go @@ -0,0 +1,7 @@ +package cmd + +import "github.com/google/wire" + +var WireSet = wire.NewSet( + NewController, +) diff --git a/internal/controllers/wire.go b/internal/controllers/wire.go index 016647700c..0382f83939 100644 --- a/internal/controllers/wire.go +++ b/internal/controllers/wire.go @@ -3,18 +3,21 @@ package controllers import ( "github.com/google/wire" + "github.com/tilt-dev/tilt/internal/controllers/core/cmd" "github.com/tilt-dev/tilt/internal/controllers/core/filewatch" ) var controllerSet = wire.NewSet( filewatch.NewController, + cmd.WireSet, ProvideControllers, ) -func ProvideControllers(fileWatch *filewatch.Controller) []Controller { +func ProvideControllers(fileWatch *filewatch.Controller, cmd *cmd.Controller) []Controller { return []Controller{ fileWatch, + cmd, } }