fix: Remove completelly Devworkspace Che-operator when server:delete is executed

src/api/che.ts

@@ -24,7 +24,7 @@ import * as rimraf from 'rimraf'
 import * as unzipper from 'unzipper'
 
 import { OpenShiftHelper } from '../api/openshift'
-import { CHE_ROOT_CA_SECRET_NAME, DEFAULT_CA_CERT_FILE_NAME, OPERATOR_TEMPLATE_DIR } from '../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL, CHE_ROOT_CA_SECRET_NAME, DEFAULT_CA_CERT_FILE_NAME, OPERATOR_TEMPLATE_DIR } from '../constants'
 import { base64Decode, downloadFile } from '../util'
 
 import { CheApiClient } from './che-api-client'
@@ -214,7 +214,7 @@ export class CheHelper {
     let adminUsername
     let adminPassword
 
-    const cheCluster = await this.kube.getCheCluster(cheNamespace)
+    const cheCluster = await this.kube.getCustomResource(cheNamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
     if (!cheCluster || cheCluster.spec.auth.externalIdentityProvider) {
       return []
     }

src/api/kube.ts

@@ -19,7 +19,7 @@ import { merge } from 'lodash'
 import * as net from 'net'
 import { Writable } from 'stream'
 
-import { CHE_CLUSTER_CRD, DEFAULT_K8S_POD_ERROR_RECHECK_TIMEOUT, DEFAULT_K8S_POD_WAIT_TIMEOUT, OLM_STABLE_CHANNEL_NAME } from '../constants'
+import { DEFAULT_K8S_POD_ERROR_RECHECK_TIMEOUT, DEFAULT_K8S_POD_WAIT_TIMEOUT, OLM_STABLE_CHANNEL_NAME } from '../constants'
 import { getClusterClientCommand, isKubernetesPlatformFamily, safeLoadFromYamlFile } from '../util'
 
 import { V1Certificate } from './typings/cert-manager'
@@ -790,7 +790,7 @@ export class KubeHelper {
     }
   }
 
-  async patchCheClusterCustomResource(name: string, namespace: string, patch: any): Promise<any | undefined> {
+  async patchCustomResource(name: string, namespace: string, patch: any, resourceAPIGroup: string, resourceAPIVersion: string, resourcePlural: string): Promise<any | undefined> {
     const k8sCoreApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
 
     // It is required to patch content-type, otherwise request will be rejected with 415 (Unsupported media type) error.
@@ -801,7 +801,7 @@ export class KubeHelper {
     }
 
     try {
-      const res = await k8sCoreApi.patchNamespacedCustomObject('org.eclipse.che', 'v1', namespace, 'checlusters', name, patch, undefined, undefined, undefined, requestOptions)
+      const res = await k8sCoreApi.patchNamespacedCustomObject(resourceAPIGroup, resourceAPIVersion, namespace, resourcePlural, name, patch, undefined, undefined, undefined, requestOptions)
       if (res && res.body) {
         return res.body
       }
@@ -1620,12 +1620,12 @@ export class KubeHelper {
   }
 
   /**
-   * Returns `checlusters.org.eclipse.che' in the given namespace.
+   * Returns custom resource in the given namespace.
    */
-  async getCheCluster(namespace: string): Promise<any | undefined> {
+  async getCustomResource(namespace: string, resourceAPIGroup: string, resourceAPIVersion: string, resourcePlural: string): Promise<any | undefined> {
     const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
     try {
-      const { body } = await customObjectsApi.listNamespacedCustomObject('org.eclipse.che', 'v1', namespace, 'checlusters')
+      const { body } = await customObjectsApi.listNamespacedCustomObject(resourceAPIGroup, resourceAPIVersion, namespace, resourcePlural)
       if (!(body as any).items) {
         return
       }
@@ -1634,54 +1634,54 @@ export class KubeHelper {
       if (crs.length === 0) {
         return
       } else if (crs.length !== 1) {
-        throw new Error(`Too many resources '${CHE_CLUSTER_CRD}' found in the namespace '${namespace}'`)
+        throw new Error(`Too many resources of type ${resourcePlural}.${resourceAPIGroup} found in the namespace '${namespace}'`)
       }
 
       return crs[0]
     } catch (e) {
       if (e.response.statusCode === 404) {
-        // There is no CR 'checluster`
+        // There is no CRD
         return
       }
       throw this.wrapK8sClientError(e)
     }
   }
 
   /**
-   * Returns all `checlusters.org.eclipse.che' resources
+   * Returns all custom resources
    */
-  async getAllCheClusters(): Promise<any[]> {
+  async getAllCustomResources(resourceAPIGroup: string, resourceAPIVersion: string, resourcePlural: string): Promise<any[]> {
     const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
     try {
-      const { body } = await customObjectsApi.listClusterCustomObject('org.eclipse.che', 'v1', 'checlusters')
+      const { body } = await customObjectsApi.listClusterCustomObject(resourceAPIGroup, resourceAPIVersion, resourcePlural)
       return (body as any).items ? (body as any).items : []
     } catch (e) {
       if (e.response.statusCode === 404) {
-        // There is no CRD 'checlusters`
+        // There is no CRD
         return []
       }
       throw this.wrapK8sClientError(e)
     }
   }
 
   /**
-   * Deletes `checlusters.org.eclipse.che' resources in the given namespace.
+   * Deletes custom resources in the given namespace.
    */
-  async deleteCheCluster(namespace: string): Promise<void> {
+  async deleteCustomResource(namespace: string, resourceAPIGroup: string, resourceAPIVersion: string, resourcePlural: string): Promise<void> {
     const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
     try {
-      const { body } = await customObjectsApi.listNamespacedCustomObject('org.eclipse.che', 'v1', namespace, 'checlusters')
+      const { body } = await customObjectsApi.listNamespacedCustomObject(resourceAPIGroup, resourceAPIVersion, namespace, resourcePlural)
       if (!(body as any).items) {
         return
       }
 
       const crs = (body as any).items as any[]
       for (const cr of crs) {
-        await customObjectsApi.deleteNamespacedCustomObject('org.eclipse.che', 'v1', namespace, 'checlusters', cr.metadata.name)
+        await customObjectsApi.deleteNamespacedCustomObject(resourceAPIGroup, resourceAPIVersion, namespace, resourcePlural, cr.metadata.name)
       }
     } catch (e) {
       if (e.response.statusCode === 404) {
-        // There is no CRD 'checlusters`
+        // There is no CRD
         return
       }
       throw this.wrapK8sClientError(e)

src/api/version.ts

@@ -17,7 +17,7 @@ import Listr = require('listr')
 import * as path from 'path'
 import * as semver from 'semver'
 
-import { CHECTL_PROJECT_NAME } from '../constants'
+import { CHECTL_PROJECT_NAME, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL } from '../constants'
 import { CheTasks } from '../tasks/che'
 import { getClusterClientCommand, getProjectName, getProjectVersion } from '../util'
 
@@ -161,7 +161,7 @@ export namespace VersionHelper {
   export async function getCheVersion(flags: any): Promise<string> {
     const kube = new KubeHelper(flags)
     const cheTasks = new CheTasks(flags)
-    const cheCluster = await kube.getCheCluster(flags.chenamespace)
+    const cheCluster = await kube.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
     if (cheCluster && cheCluster.spec.server.cheFlavor !== 'che') {
       return cheCluster.status.cheVersion
     }

src/commands/server/delete.ts

@@ -17,7 +17,7 @@ import Listr = require('listr')
 import { ChectlContext } from '../../api/context'
 import { KubeHelper } from '../../api/kube'
 import { assumeYes, batch, cheDeployment, cheNamespace, CHE_TELEMETRY, listrRenderer, skipKubeHealthzCheck } from '../../common-flags'
-import { DEFAULT_ANALYTIC_HOOK_NAME } from '../../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, DEFAULT_ANALYTIC_HOOK_NAME } from '../../constants'
 import { CheTasks } from '../../tasks/che'
 import { DevWorkspaceTasks } from '../../tasks/component-installers/devfile-workspace-operator-installer'
 import { HelmTasks } from '../../tasks/installers/helm'
@@ -80,9 +80,9 @@ export default class Delete extends Command {
 
     // Remove devworkspace controller only if there are no more cheClusters after olm/operator tasks
     tasks.add({
-      title: 'Uninstall DevWorkspace Controller',
+      title: 'Uninstall DevWorkspace Controller and DevWorkspace Che Controller',
       task: async (_ctx: any, task: any) => {
-        const checlusters = await kube.getAllCheClusters()
+        const checlusters = await kube.getAllCustomResources(CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, 'checlusters')
         if (checlusters.length === 0) {
           return new Listr(devWorkspaceTasks.getUninstallTasks())
         }

src/commands/server/status.ts

@@ -16,7 +16,7 @@ import { ChectlContext } from '../../api/context'
 import { KubeHelper } from '../../api/kube'
 import { VersionHelper } from '../../api/version'
 import { cheNamespace, CHE_TELEMETRY } from '../../common-flags'
-import { DEFAULT_ANALYTIC_HOOK_NAME } from '../../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL, DEFAULT_ANALYTIC_HOOK_NAME } from '../../constants'
 import { findWorkingNamespace } from '../../util'
 
 export default class Status extends Command {
@@ -39,7 +39,7 @@ export default class Status extends Command {
     let openshiftOauth = 'No'
 
     await this.config.runHook(DEFAULT_ANALYTIC_HOOK_NAME, { command: Status.id, flags })
-    const cr = await kube.getCheCluster(flags.chenamespace)
+    const cr = await kube.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
     if (cr && cr.spec && cr.spec.auth && cr.spec.auth.openShiftoAuth && await kube.isOpenShift()) {
       openshiftOauth = 'Yes'
     }

src/commands/server/update.ts

@@ -18,7 +18,7 @@ import * as semver from 'semver'
 import { ChectlContext } from '../../api/context'
 import { KubeHelper } from '../../api/kube'
 import { assumeYes, batch, cheDeployment, cheDeployVersion, cheNamespace, cheOperatorCRPatchYaml, CHE_OPERATOR_CR_PATCH_YAML_KEY, CHE_TELEMETRY, DEPLOY_VERSION_KEY, listrRenderer, skipKubeHealthzCheck } from '../../common-flags'
-import { DEFAULT_ANALYTIC_HOOK_NAME, DEFAULT_CHE_OPERATOR_IMAGE_NAME, MIN_CHE_OPERATOR_INSTALLER_VERSION, SUBSCRIPTION_NAME } from '../../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL, DEFAULT_ANALYTIC_HOOK_NAME, DEFAULT_CHE_OPERATOR_IMAGE_NAME, MIN_CHE_OPERATOR_INSTALLER_VERSION, SUBSCRIPTION_NAME } from '../../constants'
 import { checkChectlAndCheVersionCompatibility, downloadTemplates, getPrintHighlightedMessagesTask } from '../../tasks/installers/common-tasks'
 import { InstallerTasks } from '../../tasks/installers/installer'
 import { ApiTasks } from '../../tasks/platforms/api'
@@ -170,7 +170,7 @@ export default class Update extends Command {
    */
   private async checkComponentImages(flags: any): Promise<void> {
     const kubeHelper = new KubeHelper(flags)
-    const cheCluster = await kubeHelper.getCheCluster(flags.chenamespace)
+    const cheCluster = await kubeHelper.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
     if (cheCluster.spec.server.cheImage
       || cheCluster.spec.server.cheImageTag
       || cheCluster.spec.server.devfileRegistryImage
@@ -364,7 +364,7 @@ export default class Update extends Command {
    */
   private async setDomainFlag(flags: any): Promise<void> {
     const kubeHelper = new KubeHelper(flags)
-    const cheCluster = await kubeHelper.getCheCluster(flags.chenamespace)
+    const cheCluster = await kubeHelper.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
     if (cheCluster && cheCluster.spec.k8s && cheCluster.spec.k8s.ingressDomain) {
       flags.domain = cheCluster.spec.k8s.ingressDomain
     }

src/constants.ts

@@ -30,7 +30,6 @@ export const CHE_TLS_SECRET_NAME = 'che-tls'
 export const CHE_ROOT_CA_SECRET_NAME = 'self-signed-certificate'
 export const DEFAULT_CA_CERT_FILE_NAME = 'cheCA.crt'
 export const CHE_CLUSTER_CR_NAME = 'eclipse-che'
-export const CHE_CLUSTER_CRD = 'checlusters.org.eclipse.che'
 
 // operator
 export const OPERATOR_DEPLOYMENT_NAME = 'che-operator'
@@ -77,3 +76,9 @@ export const DEFAULT_ANALYTIC_HOOK_NAME = 'analytics'
 // Timeouts
 export const DEFAULT_K8S_POD_WAIT_TIMEOUT = 600000
 export const DEFAULT_K8S_POD_ERROR_RECHECK_TIMEOUT = 15000
+
+// Custom Resources names
+export const CHE_CLUSTER_CRD = 'checlusters.org.eclipse.che'
+export const CHE_CLUSTER_API_GROUP = 'org.eclipse.che'
+export const CHE_CLUSTER_API_VERSION = 'v1'
+export const CHE_CLUSTER_KIND_PLURAL = 'checlusters'

src/tasks/che.ts

@@ -16,7 +16,7 @@ import { CheServerLoginManager } from '../api/che-login-manager'
 import { KubeHelper } from '../api/kube'
 import { OpenShiftHelper } from '../api/openshift'
 import { VersionHelper } from '../api/version'
-import { CHE_OPERATOR_SELECTOR, DOC_LINK, DOC_LINK_RELEASE_NOTES, OUTPUT_SEPARATOR } from '../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL, CHE_OPERATOR_SELECTOR, DOC_LINK, DOC_LINK_RELEASE_NOTES, OUTPUT_SEPARATOR } from '../constants'
 import { base64Decode } from '../util'
 
 import { KubeTasks } from './kube'
@@ -456,7 +456,7 @@ export class CheTasks {
       {
         title: `Delete consoleLink ${this.cheConsoleLinkName}`,
         task: async (_ctx: any, task: any) => {
-          const checlusters = await this.kube.getAllCheClusters()
+          const checlusters = await this.kube.getAllCustomResources(CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, 'checlusters')
           // Delete the consoleLink only in case if there no more checluster installed
           if (checlusters.length === 0) {
             await this.kube.deleteConsoleLink(this.cheConsoleLinkName)
@@ -669,7 +669,7 @@ export class CheTasks {
           const cheUrl = await this.che.cheURL(flags.chenamespace)
           messages.push(`Users Dashboard           : ${cheUrl}`)
 
-          const cr = await this.kube.getCheCluster(flags.chenamespace)
+          const cr = await this.kube.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
           if (ctx.isOpenShift && cr && cr.spec && cr.spec.auth && cr.spec.auth.openShiftoAuth) {
             if (cr.status && cr.status.openShiftOAuthUserCredentialsSecret) {
               let user = ''

src/tasks/component-installers/devfile-workspace-operator-installer.ts

@@ -8,6 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
+import { cli } from 'cli-ux'
 import * as Listr from 'listr'
 import * as path from 'path'
 
@@ -84,6 +85,14 @@ export class DevWorkspaceTasks {
   protected WTOSubscriptionName = 'web-terminal'
   protected WTONamespace = 'openshift-operators'
 
+  // Devworkspace Che operator namespace
+  protected devworkspaceCheNamespace = 'devworkspace-che'
+
+  // chemanager k8s object info
+  protected cheManagerApiGroupName = 'che.eclipse.org'
+  protected cheManagerApiVersionName = 'v1alpha1'
+  protected cheManagerCRDName = 'chemanagers.che.eclipse.org'
+  protected cheManagersKindPlural = 'chemanagers'
   constructor(private readonly flags: any) {
     this.kubeHelper = new KubeHelper(flags)
     this.cheHelper = new CheHelper(flags)
@@ -273,6 +282,44 @@ export class DevWorkspaceTasks {
           task.title = await `${task.title}...OK`
         }
       },
+      {
+        title: `Delete the Custom Resource of type ${this.cheManagerCRDName}`,
+        task: async (_ctx: any, task: any) => {
+          await this.kubeHelper.deleteCustomResource(this.devworkspaceCheNamespace, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)
+
+          // wait 20 seconds, default timeout in che operator
+          for (let index = 0; index < 20; index++) {
+            await cli.wait(1000)
+            if (!await this.kubeHelper.getCustomResource(this.devworkspaceCheNamespace, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)) {
+              task.title = `${task.title}...OK`
+              return
+            }
+          }
+
+          // if chemanager instance still exists then remove finalizers and delete again
+          const chemanager = await this.kubeHelper.getCustomResource(this.devworkspaceCheNamespace, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)
+          if (chemanager) {
+            try {
+              await this.kubeHelper.patchCustomResource(chemanager.metadata.name, this.devworkspaceCheNamespace, { metadata: { finalizers: null } }, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)
+            } catch (error) {
+              if (await this.kubeHelper.getCustomResource(this.devworkspaceCheNamespace, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)) {
+                task.title = `${task.title}...OK`
+                return // successfully removed
+              }
+              throw error
+            }
+
+            // wait 2 seconds
+            await cli.wait(2000)
+          }
+
+          if (!await this.kubeHelper.getCustomResource(this.devworkspaceCheNamespace, this.cheManagerApiGroupName, this.cheManagerApiVersionName, this.cheManagersKindPlural)) {
+            task.title = `${task.title}...OK`
+          } else {
+            task.title = `${task.title}...Failed`
+          }
+        }
+      },
     ]
   }
 }

src/tasks/installers/common-tasks.ts

@@ -21,7 +21,7 @@ import { ChectlContext } from '../../api/context'
 import { CheGithubClient } from '../../api/github-client'
 import { KubeHelper } from '../../api/kube'
 import { VersionHelper } from '../../api/version'
-import { CHE_CLUSTER_CRD, DOCS_LINK_IMPORT_CA_CERT_INTO_BROWSER, OPERATOR_TEMPLATE_DIR } from '../../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_CRD, CHE_CLUSTER_KIND_PLURAL, DOCS_LINK_IMPORT_CA_CERT_INTO_BROWSER, OPERATOR_TEMPLATE_DIR } from '../../constants'
 import { getProjectVersion } from '../../util'
 
 export function createNamespaceTask(namespaceName: string, labels: {}): Listr.ListrTask {
@@ -165,7 +165,7 @@ export function patchingEclipseCheCluster(flags: any, kube: KubeHelper, command:
     title: `Patching the Custom Resource of type '${CHE_CLUSTER_CRD}' in the namespace '${flags.chenamespace}'`,
     skip: (ctx: any) => isEmpty(ctx[ChectlContext.CR_PATCH]),
     task: async (ctx: any, task: any) => {
-      const cheCluster = await kube.getCheCluster(flags.chenamespace)
+      const cheCluster = await kube.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
       if (!cheCluster) {
         command.error(`Eclipse Che cluster CR is not found in the namespace '${flags.chenamespace}'`)
       }

src/tasks/installers/olm.ts

@@ -17,7 +17,7 @@ import * as path from 'path'
 import { KubeHelper } from '../../api/kube'
 import { CatalogSource, Subscription } from '../../api/typings/olm'
 import { VersionHelper } from '../../api/version'
-import { CUSTOM_CATALOG_SOURCE_NAME, CVS_PREFIX, DEFAULT_CHE_OLM_PACKAGE_NAME, DEFAULT_OLM_KUBERNETES_NAMESPACE, DEFAULT_OPENSHIFT_MARKET_PLACE_NAMESPACE, KUBERNETES_OLM_CATALOG, NIGHTLY_CATALOG_SOURCE_NAME, OLM_NIGHTLY_CHANNEL_NAME, OLM_STABLE_CHANNEL_NAME, OPENSHIFT_OLM_CATALOG, OPERATOR_GROUP_NAME, SUBSCRIPTION_NAME } from '../../constants'
+import { CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL, CUSTOM_CATALOG_SOURCE_NAME, CVS_PREFIX, DEFAULT_CHE_OLM_PACKAGE_NAME, DEFAULT_OLM_KUBERNETES_NAMESPACE, DEFAULT_OPENSHIFT_MARKET_PLACE_NAMESPACE, KUBERNETES_OLM_CATALOG, NIGHTLY_CATALOG_SOURCE_NAME, OLM_NIGHTLY_CHANNEL_NAME, OLM_STABLE_CHANNEL_NAME, OPENSHIFT_OLM_CATALOG, OPERATOR_GROUP_NAME, SUBSCRIPTION_NAME } from '../../constants'
 import { isKubernetesPlatformFamily } from '../../util'
 
 import { createEclipseCheCluster, createNamespaceTask, patchingEclipseCheCluster } from './common-tasks'
@@ -198,7 +198,7 @@ export class OLMTasks {
       {
         title: 'Prepare Eclipse Che cluster CR',
         task: async (ctx: any, task: any) => {
-          const cheCluster = await kube.getCheCluster(flags.chenamespace)
+          const cheCluster = await kube.getCustomResource(flags.chenamespace, CHE_CLUSTER_API_GROUP, CHE_CLUSTER_API_VERSION, CHE_CLUSTER_KIND_PLURAL)
           if (cheCluster) {
             task.title = `${task.title}...It already exists..`
             return