Skip to content

Commit

Permalink
cluster: add reconciler scaffolding (#5257)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicks committed Dec 7, 2021
1 parent 0d16988 commit 1a0e1c5
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 3 deletions.
10 changes: 7 additions & 3 deletions internal/cli/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions internal/controllers/core/cluster/reconciler.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package cluster

import (
"context"

apierrors "k8s.io/apimachinery/pkg/api/errors"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
)

type Reconciler struct {
ctrlClient ctrlclient.Client
}

func (r *Reconciler) CreateBuilder(mgr ctrl.Manager) (*builder.Builder, error) {
b := ctrl.NewControllerManagedBy(mgr).
For(&v1alpha1.Cluster{})
return b, nil
}

func NewReconciler(ctrlClient ctrlclient.Client) *Reconciler {
return &Reconciler{
ctrlClient: ctrlClient,
}
}

func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
nn := request.NamespacedName

var obj v1alpha1.Cluster
err := r.ctrlClient.Get(ctx, nn, &obj)
if err != nil && !apierrors.IsNotFound(err) {
return ctrl.Result{}, err
}

return ctrl.Result{}, nil
}
7 changes: 7 additions & 0 deletions internal/controllers/core/cluster/wire.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package cluster

import "github.com/google/wire"

var WireSet = wire.NewSet(
NewReconciler,
)
4 changes: 4 additions & 0 deletions internal/controllers/wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"github.com/google/wire"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/tilt-dev/tilt/internal/controllers/core/cluster"
"github.com/tilt-dev/tilt/internal/controllers/core/cmd"
"github.com/tilt-dev/tilt/internal/controllers/core/configmap"
"github.com/tilt-dev/tilt/internal/controllers/core/dockerimage"
Expand All @@ -29,6 +30,7 @@ var controllerSet = wire.NewSet(
podlogstream.NewController,
podlogstream.NewPodSource,
kubernetesapply.NewReconciler,
cluster.NewReconciler,

ProvideControllers,
)
Expand All @@ -50,6 +52,7 @@ func ProvideControllers(
lur *liveupdate.Reconciler,
cmr *configmap.Reconciler,
dir *dockerimage.Reconciler,
clr *cluster.Reconciler,
) []Controller {
return []Controller{
fileWatch,
Expand All @@ -68,6 +71,7 @@ func ProvideControllers(
lur,
cmr,
dir,
clr,
}
}

Expand Down
3 changes: 3 additions & 0 deletions internal/engine/upper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"github.com/tilt-dev/tilt/internal/containerupdate"
"github.com/tilt-dev/tilt/internal/controllers"
apitiltfile "github.com/tilt-dev/tilt/internal/controllers/apis/tiltfile"
"github.com/tilt-dev/tilt/internal/controllers/core/cluster"
"github.com/tilt-dev/tilt/internal/controllers/core/cmd"
"github.com/tilt-dev/tilt/internal/controllers/core/configmap"
"github.com/tilt-dev/tilt/internal/controllers/core/dockerimage"
Expand Down Expand Up @@ -3855,6 +3856,7 @@ func newTestFixture(t *testing.T, options ...fixtureOptions) *testFixture {
cu := &containerupdate.FakeContainerUpdater{}
lur := liveupdate.NewFakeReconciler(st, cu, cdc)
dir := dockerimage.NewReconciler(cdc)
clr := cluster.NewReconciler(cdc)
cb := controllers.NewControllerBuilder(tscm, controllers.ProvideControllers(
fwc,
cmds,
Expand All @@ -3872,6 +3874,7 @@ func newTestFixture(t *testing.T, options ...fixtureOptions) *testFixture {
lur,
cmr,
dir,
clr,
))

dp := dockerprune.NewDockerPruner(dockerClient)
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/core/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func AllResourceObjects() []resource.Object {
&LiveUpdate{},
&ToggleButton{},
&DockerImage{},
&Cluster{},

// Hey! You! If you're adding a new top-level type, add the type object here.
}
Expand All @@ -94,6 +95,7 @@ func AllResourceLists() []runtime.Object {
&LiveUpdateList{},
&ToggleButtonList{},
&DockerImageList{},
&ClusterList{},

// Hey! You! If you're adding a new top-level type, add the List type here.
}
Expand Down

0 comments on commit 1a0e1c5

Please sign in to comment.