Cleanup

Author: aledbf

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

@@ -49,9 +49,8 @@ func TestAPIs(t *testing.T) {
 }
 
 var (
-	ctx    context.Context
-	cancel context.CancelFunc
-	//wsActivity *activity.WorkspaceActivity
+	ctx       context.Context
+	cancel    context.CancelFunc
 	wsMetrics *controllerMetrics
 )
 
@@ -110,7 +109,6 @@ var _ = BeforeSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 	Expect(wsReconciler.SetupWithManager(k8sManager)).To(Succeed())
 
-	//wsActivity = activity.NewWorkspaceActivity(conf.Namespace, k8sManager.GetClient())
 	timeoutReconciler, err := NewTimeoutReconciler(k8sManager.GetClient(), k8sManager.GetEventRecorderFor("workspace"), conf, maintenance)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(timeoutReconciler.SetupWithManager(k8sManager)).To(Succeed())

components/ws-manager-mk2/service/manager.go

@@ -519,13 +519,6 @@ func (wsm *WorkspaceManagerServer) MarkActive(ctx context.Context, req *wsmanapi
 		log.WithError(err).WithFields(log.OWI("", "", workspaceID)).Warn("was unable to update status")
 	}
 
-	err = retry.RetryOnConflict(retryParams, func() error {
-		return wsm.Client.Status().Update(ctx, &ws)
-	})
-	if err != nil {
-		log.Error(err, "cannot update workspace status")
-	}
-
 	// We do however maintain the the "closed" flag as condition on the workspace. This flag should not change
 	// very often and provides a better UX if it persists across ws-manager restarts.
 	isMarkedClosed := ws.IsConditionTrue(workspacev1.WorkspaceConditionClosed)