feat: Deleting the common PVC if there are no workspaces left for a given user

infrastructures/kubernetes/pom.xml

@@ -129,6 +129,10 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-account</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
@@ -197,6 +201,10 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-machine-authentication</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.multiuser</groupId>
+            <artifactId>che-multiuser-personal-account</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
@@ -230,11 +238,6 @@
             <artifactId>kubernetes-server-mock</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-account</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-test</artifactId>

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesPersistentVolumeClaims.java

@@ -159,6 +159,26 @@ public void delete(Map<String, String> labels) throws InfrastructureException {
     }
   }
 
+  /**
+   * Removes PVC by name.
+   *
+   * @param name the name of the PVC
+   * @throws InfrastructureException when any error occurs while removing
+   */
+  public void delete(final String name) throws InfrastructureException {
+    try {
+      clientFactory
+          .create(workspaceId)
+          .persistentVolumeClaims()
+          .inNamespace(namespace)
+          .withName(name)
+          .withPropagationPolicy(BACKGROUND)
+          .delete();
+    } catch (KubernetesClientException e) {
+      throw new KubernetesInfrastructureException(e);
+    }
+  }
+
   /**
    * Waits until persistent volume claim state is bound. If used k8s Storage Class has
    * 'volumeBindingMode: WaitForFirstConsumer', we don't wait to avoid deadlock.

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java

@@ -15,6 +15,7 @@
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toSet;
+import static org.eclipse.che.api.user.server.UserManager.PERSONAL_ACCOUNT;
 import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesObjectUtil.newPVC;
 
 import com.google.inject.Inject;
@@ -24,8 +25,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.inject.Named;
+import org.eclipse.che.account.spi.AccountImpl;
+import org.eclipse.che.api.core.Page;
+import org.eclipse.che.api.core.ServerException;
 import org.eclipse.che.api.core.model.workspace.Workspace;
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.WorkspaceManager;
+import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl;
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.commons.annotation.Traced;
 import org.eclipse.che.commons.tracing.TracingTags;
@@ -70,7 +76,6 @@
  * @author Alexander Garagatyi
  */
 public class CommonPVCStrategy implements WorkspaceVolumesStrategy {
-
   // use non-static variable to reuse child class logger
   private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -96,6 +101,7 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy {
   private final PodsVolumes podsVolumes;
   private final SubPathPrefixes subpathPrefixes;
   private final boolean waitBound;
+  private final WorkspaceManager workspaceManager;
 
   @Inject
   public CommonPVCStrategy(
@@ -110,7 +116,8 @@ public CommonPVCStrategy(
       EphemeralWorkspaceAdapter ephemeralWorkspaceAdapter,
       PVCProvisioner pvcProvisioner,
       PodsVolumes podsVolumes,
-      SubPathPrefixes subpathPrefixes) {
+      SubPathPrefixes subpathPrefixes,
+      WorkspaceManager workspaceManager) {
     this.configuredPVCName = configuredPVCName;
     this.pvcQuantity = pvcQuantity;
     this.pvcAccessMode = pvcAccessMode;
@@ -123,6 +130,7 @@ public CommonPVCStrategy(
     this.pvcProvisioner = pvcProvisioner;
     this.podsVolumes = podsVolumes;
     this.subpathPrefixes = subpathPrefixes;
+    this.workspaceManager = workspaceManager;
   }
 
   /**
@@ -230,6 +238,14 @@ public void cleanup(Workspace workspace) throws InfrastructureException {
     if (EphemeralWorkspaceUtility.isEphemeral(workspace)) {
       return;
     }
+
+    AccountImpl account = ((WorkspaceImpl) workspace).getAccount();
+    if (isPersonalAccount(account) && accountHasNoWorkspaces(account)) {
+      log.debug("Deleting the common PVC: '{}',", configuredPVCName);
+      deleteCommonPVC(workspace);
+      return;
+    }
+
     String workspaceId = workspace.getId();
     PersistentVolumeClaim pvc = createCommonPVC(workspaceId);
     pvcSubPathHelper.removeDirsAsync(
@@ -258,4 +274,35 @@ private Set<String> combineVolumeMountsSubpaths(KubernetesEnvironment k8sEnv) {
         .filter(subpath -> !isNullOrEmpty(subpath))
         .collect(Collectors.toSet());
   }
+
+  private void deleteCommonPVC(Workspace workspace) throws InfrastructureException {
+    factory.get(workspace).persistentVolumeClaims().delete(configuredPVCName);
+  }
+
+  /**
+   * @param account the account of interest
+   * @return true, if the given account is a personal account, false otherwise
+   */
+  private boolean isPersonalAccount(AccountImpl account) {
+    return PERSONAL_ACCOUNT.equals(account.getType());
+  }
+
+  /**
+   * @param account the account of interest
+   * @return true, if the given account has no workspaces, false otherwise
+   * @throws InfrastructureException
+   */
+  private boolean accountHasNoWorkspaces(AccountImpl account) throws InfrastructureException {
+    try {
+      Page<WorkspaceImpl> workspaces = workspaceManager.getWorkspaces(account.getId(), false, 1, 0);
+      if (workspaces.isEmpty()) {
+        log.debug("User '{}' has no more workspaces left", account.getId());
+        return true;
+      }
+    } catch (ServerException e) {
+      // should never happen
+      throw new InfrastructureException(e.getLocalizedMessage(), e);
+    }
+    return false;
+  }
 }

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java

@@ -20,6 +20,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.eclipse.che.api.core.model.workspace.Workspace;
+import org.eclipse.che.api.workspace.server.WorkspaceManager;
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesNamespaceFactory;
 
@@ -62,7 +63,8 @@ public PerWorkspacePVCStrategy(
       EphemeralWorkspaceAdapter ephemeralWorkspaceAdapter,
       PVCProvisioner pvcProvisioner,
       PodsVolumes podsVolumes,
-      SubPathPrefixes subpathPrefixes) {
+      SubPathPrefixes subpathPrefixes,
+      WorkspaceManager workspaceManager) {
     super(
         pvcName,
         pvcQuantity,
@@ -75,7 +77,8 @@ public PerWorkspacePVCStrategy(
         ephemeralWorkspaceAdapter,
         pvcProvisioner,
         podsVolumes,
-        subpathPrefixes);
+        subpathPrefixes,
+        workspaceManager);
     this.pvcNamePrefix = pvcName;
     this.factory = factory;
     this.pvcAccessMode = pvcAccessMode;