CHE-8611 Add warning suppressing when namespace/project doesn't exist…

… on removing
eclipse-che · Feb 6, 2018 · dd4d9af · dd4d9af
1 parent 9abe8e4
commit dd4d9af
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...e/che/workspace/infrastructure/kubernetes/namespace/RemoveNamespaceOnWorkspaceRemove.java b/...e/che/workspace/infrastructure/kubernetes/namespace/RemoveNamespaceOnWorkspaceRemove.java
@@ -15,6 +15,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import javax.inject.Named;
 import org.eclipse.che.api.core.notification.EventService;
 import org.eclipse.che.api.core.notification.EventSubscriber;
@@ -66,6 +67,13 @@ public void onEvent(WorkspaceRemovedEvent event) {
 
   @VisibleForTesting
   void doRemoveNamespace(String namespaceName) throws InfrastructureException {
-    clientFactory.create().namespaces().withName(namespaceName).delete();
+    try {
+      clientFactory.create().namespaces().withName(namespaceName).delete();
+    } catch (KubernetesClientException e) {
+      if (!(e.getCode() == 403)) {
+        throw new InfrastructureException(e.getMessage(), e);
+      }
+      // namespace doesn't exist
+    }
   }
 }
diff --git a/...clipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java b/...clipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java
@@ -15,6 +15,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import javax.inject.Named;
 import org.eclipse.che.api.core.notification.EventService;
 import org.eclipse.che.api.core.notification.EventSubscriber;
@@ -32,6 +33,7 @@
  */
 @Singleton
 public class RemoveProjectOnWorkspaceRemove implements EventSubscriber<WorkspaceRemovedEvent> {
+
   private static final Logger LOG = LoggerFactory.getLogger(RemoveProjectOnWorkspaceRemove.class);
 
   private final OpenShiftClientFactory clientFactory;
@@ -66,6 +68,13 @@ public void onEvent(WorkspaceRemovedEvent event) {
 
   @VisibleForTesting
   void doRemoveProject(String projectName) throws InfrastructureException {
-    clientFactory.create().projects().withName(projectName).delete();
+    try {
+      clientFactory.create().projects().withName(projectName).delete();
+    } catch (KubernetesClientException e) {
+      if (!(e.getCode() == 403)) {
+        throw new InfrastructureException(e.getMessage(), e);
+      }
+      // project doesn't exist
+    }
   }
 }