Remove unnecessary changes

Author: filiptronicek

components/ws-daemon/pkg/controller/suite_test.go

@@ -77,27 +77,17 @@ var _ = BeforeSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 	ctx, cancel = context.WithCancel(context.Background())
 
-	By("Setting up workspace controller")
 	workspaceCtrl, err = NewWorkspaceController(k8sClient, record.NewFakeRecorder(100), NodeName, secretsNamespace, 5, nil, ctrl_metrics.Registry, nil)
 	Expect(err).NotTo(HaveOccurred())
-	Expect(workspaceCtrl.SetupWithManager(k8sManager)).To(Succeed())
 
+	Expect(workspaceCtrl.SetupWithManager(k8sManager)).To(Succeed())
 	_ = createNamespace(secretsNamespace)
 
-	By("Starting the manager")
 	go func() {
 		defer GinkgoRecover()
 		err = k8sManager.Start(ctx)
 		Expect(err).ToNot(HaveOccurred(), "failed to run manager")
 	}()
-
-	By("Waiting for controllers to be ready")
-	DeferCleanup(cancel)
-
-	// Wait for controllers to be ready
-	Eventually(func() bool {
-		return k8sManager.GetCache().WaitForCacheSync(ctx)
-	}, time.Second*10, time.Millisecond*100).Should(BeTrue())
 })
 
 func createNamespace(name string) *corev1.Namespace {

components/ws-daemon/pkg/controller/workspace_controller_test.go

@@ -144,10 +144,6 @@ func newWorkspace(name, namespace string, phase workspacev1.WorkspacePhase) *wor
 	Expect(err).ToNot(HaveOccurred())
 
 	return &workspacev1.Workspace{
-		Status: workspacev1.WorkspaceStatus{
-			Phase:      phase,
-			Conditions: []metav1.Condition{},
-		},
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "workspace.gitpod.io/v1",
 			Kind:       "Workspace",