fixup

Signed-off-by: Anatolii Bazko <[email protected]>
che-incubator · Feb 19, 2024 · fb58405 · fb58405
1 parent aab6887
commit fb58405
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/tasks/che-tasks.ts b/src/tasks/che-tasks.ts
@@ -59,13 +59,20 @@ export namespace CheTasks {
       title: 'Wait all pods deleted',
       task: async (_ctx: any, _task: any) => {
         const flags = CheCtlContext.getFlags()
+        const kubeHelper = KubeClient.getInstance()
+        const cheCluster = await kubeHelper.getCheCluster(flags[CHE_NAMESPACE_FLAG])
 
         const tasks = newListr()
-        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.CHE_SERVER, EclipseChe.CHE_SERVER_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
-        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.DASHBOARD, EclipseChe.DASHBOARD_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
-        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.DEVFILE_REGISTRY, EclipseChe.DEVFILE_REGISTRY_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
-        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.PLUGIN_REGISTRY, EclipseChe.PLUGIN_REGISTRY_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
         tasks.add(PodTasks.getPodDeletedTask(EclipseChe.GATEWAY, EclipseChe.GATEWAY_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
+        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.DASHBOARD, EclipseChe.DASHBOARD_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
+        tasks.add(PodTasks.getPodDeletedTask(EclipseChe.CHE_SERVER, EclipseChe.CHE_SERVER_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
+
+        if (!cheCluster?.spec?.components?.devfileRegistry?.disableInternalRegistry) {
+          tasks.add(PodTasks.getPodDeletedTask(EclipseChe.DEVFILE_REGISTRY, EclipseChe.DEVFILE_REGISTRY_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
+        }
+        if (!cheCluster?.spec?.components?.pluginRegistry?.disableInternalRegistry) {
+          tasks.add(PodTasks.getPodDeletedTask(EclipseChe.PLUGIN_REGISTRY, EclipseChe.PLUGIN_REGISTRY_SELECTOR, flags[CHE_NAMESPACE_FLAG]))
+        }
         return tasks
       },
     }