Cleanup

Author: aledbf

components/ws-manager-mk2/controllers/subscriber_controller.go

@@ -9,49 +9,35 @@ import (
 	"os"
 
 	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/tools/record"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	config "github.com/gitpod-io/gitpod/ws-manager/api/config"
 	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
 )
 
-func NewSubscriberReconciler(c client.Client, scheme *runtime.Scheme, recorder record.EventRecorder, cfg *config.Configuration) (*SubscriberReconciler, error) {
+func NewSubscriberReconciler(c client.Client, cfg *config.Configuration) (*SubscriberReconciler, error) {
 	reconciler := &SubscriberReconciler{
-		Client:   c,
-		Scheme:   scheme,
-		Config:   cfg,
-		Recorder: recorder,
+		Client: c,
+		Config: cfg,
 	}
 
 	return reconciler, nil
 }
 
 type SubscriberReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
 
-	Config      *config.Configuration
-	Recorder    record.EventRecorder
+	Config *config.Configuration
+
 	OnReconcile func(ctx context.Context, ws *workspacev1.Workspace)
 }
 
-// Reconcile is part of the main kubernetes reconciliation loop which aims to
-// move the current state of the cluster closer to the desired state.
-// Modify the Reconcile function to compare the state specified by
-// the Workspace object against the actual cluster state, and then
-// perform operations to make the cluster state reflect the state specified by
-// the user.
-//
-// For more details, check Reconcile and its Result here:
-// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 func (r *SubscriberReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := log.FromContext(ctx)
 
@@ -64,28 +50,31 @@ func (r *SubscriberReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	if workspace.Status.Conditions == nil {
+		workspace.Status.Conditions = []metav1.Condition{}
+	}
+
 	if r.OnReconcile != nil {
-		// Publish to subscribers in a goroutine, to prevent blocking the main reconcile loop.
 		ws := workspace.DeepCopy()
 		go func() {
 			r.OnReconcile(ctx, ws)
 		}()
 	}
 
-	return reconcile.Result{}, nil
+	return ctrl.Result{}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *SubscriberReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
-	c, err := controller.NewUnmanaged("maintenance-controller", mgr, controller.Options{Reconciler: r})
+	c, err := controller.NewUnmanaged("subscribers-controller", mgr, controller.Options{Reconciler: r})
 	if err != nil {
 		return err
 	}
 
 	go func() {
 		err = c.Start(ctx)
 		if err != nil {
-			log.FromContext(ctx).Error(err, "cannot start maintenance reconciler")
+			log.FromContext(ctx).Error(err, "cannot start Subscriber reconciler")
 			os.Exit(1)
 		}
 	}()

components/ws-manager-mk2/controllers/timeout_controller_test.go

@@ -47,8 +47,7 @@ var _ = Describe("TimeoutController", func() {
 			customMaxLifetime *time.Duration
 			update            func(ws *workspacev1.Workspace)
 			updateStatus      func(ws *workspacev1.Workspace)
-			//controllerRestart time.Time
-			expectTimeout bool
+			expectTimeout     bool
 		}
 		DescribeTable("workspace timeouts",
 			func(tc testCase) {

components/ws-manager-mk2/main.go

@@ -162,7 +162,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	subscriberReconciler, err := controllers.NewSubscriberReconciler(mgr.GetClient(), mgr.GetScheme(), mgr.GetEventRecorderFor("subscribers"), &cfg.Manager)
+	subscriberReconciler, err := controllers.NewSubscriberReconciler(mgr.GetClient(), &cfg.Manager)
 	if err != nil {
 		setupLog.Error(err, "unable to create timeout controller", "controller", "Timeout")
 		os.Exit(1)