Explicitly marked cascade selection as Foreground

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
eclipse-che · Apr 6, 2020 · bd638ad · bd638ad
1 parent 0d00dcb
commit bd638ad
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 3 deletions.
diff --git a/.../org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesConfigsMaps.java b/.../org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesConfigsMaps.java
@@ -65,6 +65,7 @@ public void delete() throws InfrastructureException {
           .configMaps()
           .inNamespace(namespace)
           .withLabel(CHE_WORKSPACE_ID_LABEL, workspaceId)
+          .withPropagationPolicy("Foreground")
           .delete();
     } catch (KubernetesClientException e) {
       throw new KubernetesInfrastructureException(e);

diff --git a/.../org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java b/.../org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java
@@ -925,7 +925,8 @@ protected CompletableFuture<Void> doDeleteDeployment(String deploymentName)
         toCloseOnException = watch;
       }
 
-      Boolean deleteSucceeded = deploymentResource.delete();
+      Boolean deleteSucceeded =
+          deploymentResource.cascading(true).withPropagationPolicy("Foreground").delete();
 
       if (deleteSucceeded == null || !deleteSucceeded) {
         deleteFuture.complete(null);
@@ -963,7 +964,8 @@ protected CompletableFuture<Void> doDeletePod(String podName) throws Infrastruct
       final Watch watch = podResource.watch(new DeleteWatcher<Pod>(deleteFuture));
       toCloseOnException = watch;
 
-      Boolean deleteSucceeded = podResource.delete();
+      Boolean deleteSucceeded =
+          podResource.cascading(true).withPropagationPolicy("Foreground").delete();
       if (deleteSucceeded == null || !deleteSucceeded) {
         deleteFuture.complete(null);
       }

diff --git a/...va/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesIngresses.java b/...va/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesIngresses.java
@@ -144,6 +144,7 @@ public void delete() throws InfrastructureException {
           .ingresses()
           .inNamespace(namespace)
           .withLabel(CHE_WORKSPACE_ID_LABEL, workspaceId)
+          .withPropagationPolicy("Foreground")
           .delete();
     } catch (KubernetesClientException e) {
       throw new KubernetesInfrastructureException(e);

diff --git a/...va/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespace.java b/...va/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespace.java
@@ -317,7 +317,12 @@ private void update(Namespace namespace, KubernetesClient client) throws Infrast
   private void delete(String namespaceName, KubernetesClient client)
       throws InfrastructureException {
     try {
-      client.namespaces().withName(namespaceName).delete();
+      client
+          .namespaces()
+          .withName(namespaceName)
+          .cascading(true)
+          .withPropagationPolicy("Foreground")
+          .delete();
     } catch (KubernetesClientException e) {
       if (e.getCode() == 404) {
         LOG.warn(

diff --git a/...e/che/workspace/infrastructure/kubernetes/namespace/KubernetesPersistentVolumeClaims.java b/...e/che/workspace/infrastructure/kubernetes/namespace/KubernetesPersistentVolumeClaims.java
@@ -151,6 +151,7 @@ public void delete(Map<String, String> labels) throws InfrastructureException {
           .persistentVolumeClaims()
           .inNamespace(namespace)
           .withLabels(labels)
+          .withPropagationPolicy("Foreground")
           .delete();
     } catch (KubernetesClientException e) {
       throw new KubernetesInfrastructureException(e);

diff --git a/...java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesSecrets.java b/...java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesSecrets.java
@@ -19,6 +19,8 @@
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesClientFactory;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfrastructureException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines an internal API for managing {@link Secret} instances in {@link
@@ -64,6 +66,7 @@ public void delete() throws InfrastructureException {
           .secrets()
           .inNamespace(namespace)
           .withLabel(CHE_WORKSPACE_ID_LABEL, workspaceId)
+          .withPropagationPolicy("Foreground")
           .delete();
     } catch (KubernetesClientException e) {
       throw new KubernetesInfrastructureException(e);

diff --git a/...ava/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesServices.java b/...ava/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesServices.java
@@ -87,6 +87,7 @@ public void delete() throws InfrastructureException {
           .services()
           .inNamespace(namespace)
           .withLabel(CHE_WORKSPACE_ID_LABEL, workspaceId)
+          .withPropagationPolicy("Foreground")
           .delete();
     } catch (KubernetesClientException e) {
       throw new KubernetesInfrastructureException(e);