Skip to content

Commit

Permalink
dockercomposelogstream: reconciler scaffolding (#5761)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicks authored May 3, 2022
1 parent 5c05244 commit dccb471
Show file tree
Hide file tree
Showing 5 changed files with 70 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.

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

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/internal/store"
"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
)

type Reconciler struct {
client ctrlclient.Client
store store.RStore
}

var _ reconcile.Reconciler = &Reconciler{}

func NewReconciler(client ctrlclient.Client, store store.RStore) *Reconciler {
return &Reconciler{
client: client,
store: store,
}
}

func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
obj := &v1alpha1.DockerComposeLogStream{}
err := r.client.Get(ctx, req.NamespacedName, obj)
if err != nil && !apierrors.IsNotFound(err) {
return ctrl.Result{}, err
}

if apierrors.IsNotFound(err) || obj.ObjectMeta.DeletionTimestamp != nil {
return ctrl.Result{}, nil
}

return ctrl.Result{}, nil
}

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

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

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 @@ -8,6 +8,7 @@ import (
"github.com/tilt-dev/tilt/internal/controllers/core/cmd"
"github.com/tilt-dev/tilt/internal/controllers/core/cmdimage"
"github.com/tilt-dev/tilt/internal/controllers/core/configmap"
"github.com/tilt-dev/tilt/internal/controllers/core/dockercomposelogstream"
"github.com/tilt-dev/tilt/internal/controllers/core/dockercomposeservice"
"github.com/tilt-dev/tilt/internal/controllers/core/dockerimage"
"github.com/tilt-dev/tilt/internal/controllers/core/extension"
Expand Down Expand Up @@ -59,6 +60,7 @@ func ProvideControllers(
clr *cluster.Reconciler,
dcr *dockercomposeservice.Reconciler,
imr *imagemap.Reconciler,
dclsr *dockercomposelogstream.Reconciler,
) []Controller {
return []Controller{
fileWatch,
Expand All @@ -81,6 +83,7 @@ func ProvideControllers(
clr,
dcr,
imr,
dclsr,
}
}

Expand Down Expand Up @@ -109,4 +112,5 @@ var WireSet = wire.NewSet(
cmdimage.WireSet,
dockercomposeservice.WireSet,
imagemap.WireSet,
dockercomposelogstream.WireSet,
)
3 changes: 3 additions & 0 deletions internal/engine/upper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/tilt-dev/tilt/internal/controllers/core/cmd"
"github.com/tilt-dev/tilt/internal/controllers/core/cmdimage"
"github.com/tilt-dev/tilt/internal/controllers/core/configmap"
"github.com/tilt-dev/tilt/internal/controllers/core/dockercomposelogstream"
"github.com/tilt-dev/tilt/internal/controllers/core/dockercomposeservice"
"github.com/tilt-dev/tilt/internal/controllers/core/dockerimage"
"github.com/tilt-dev/tilt/internal/controllers/core/extension"
Expand Down Expand Up @@ -3398,6 +3399,7 @@ func newTestFixture(t *testing.T, options ...fixtureOptions) *testFixture {
cluster.FakeDockerClientOrError(dockerClient, nil),
cluster.FakeKubernetesClientOrError(kClient, nil),
wsl)
dclsr := dockercomposelogstream.NewReconciler(cdc, st)

cb := controllers.NewControllerBuilder(tscm, controllers.ProvideControllers(
fwc,
Expand All @@ -3420,6 +3422,7 @@ func newTestFixture(t *testing.T, options ...fixtureOptions) *testFixture {
clr,
dcr,
imagemap.NewReconciler(cdc, st),
dclsr,
))

dp := dockerprune.NewDockerPruner(dockerClient)
Expand Down

0 comments on commit dccb471

Please sign in to comment.