[ws-manager] Delete workspace CR on stop

Author: Furisto

components/ws-manager-api/go/crd/v1/workspace_types.go

@@ -5,7 +5,6 @@
 package v1
 
 import (
-	"github.com/gitpod-io/gitpod/common-go/log"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -267,11 +266,3 @@ type WorkspaceList struct {
 func init() {
 	SchemeBuilder.Register(&Workspace{}, &WorkspaceList{})
 }
-
-func (ws *Workspace) OWI() log.Fields {
-	return log.Fields{
-		OwnerField:     ws.Spec.Ownership.Owner,
-		WorkspaceField: ws.Spec.Ownership.WorkspaceID,
-		InstanceField:  ws.ObjectMeta.Name,
-	}
-}

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

@@ -187,10 +187,10 @@ func (r *WorkspaceReconciler) actOnStatus(ctx context.Context, workspace *worksp
 			return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
 		}
 
-		// err = r.Client.Delete(ctx, workspace)
-		// if err != nil {
-		// 	return ctrl.Result{Requeue: true}, err
-		// }
+		err = r.Client.Delete(ctx, workspace)
+		if err != nil {
+			return ctrl.Result{Requeue: true}, err
+		}
 	}
 
 	return ctrl.Result{}, nil