Get rid of using k8s extension provided 'kubectl' binary

The 'oc' binary is used instead in non-blocking manner, especially when getting 'api-versions' values.
Partially fixes redhat-developer#3987.

Issue: redhat-developer#3987

Signed-off-by: Victor Rubezhny <[email protected]>

Author: vrubezhny

src/k8s/clusterExplorer.ts

@@ -10,22 +10,21 @@ import { DeploymentConfig } from './deploymentConfig';
 import path = require('path');
 import { ClusterServiceVersion } from './csv';
 import { isOpenShift } from '../util/kubeUtils';
+import { CommandText } from '../base/command';
+import { CliChannel } from '../cli';
 
 let clusterExplorer: k8s.ClusterExplorerV1 | undefined;
 
 let lastNamespace = '';
 
 async function initNamespaceName(node: k8s.ClusterExplorerV1.ClusterExplorerResourceNode): Promise<string | undefined> {
-  const kubectl = await k8s.extension.kubectl.v1;
-  if (kubectl.available) {
-      const result = await kubectl.api.invokeCommand('config view -o json');
-      const config = JSON.parse(result.stdout);
-      const currentContext = (config.contexts || []).find((ctx) => ctx.name === node.name);
-      if (!currentContext) {
-          return '';
-      }
-      return currentContext.context.namespace || 'default';
-  }
+    const result = await CliChannel.getInstance().executeTool(new CommandText('oc', 'config view -o json'));
+    const config = JSON.parse(result.stdout);
+    const currentContext = (config.contexts || []).find((ctx) => ctx.name === node.name);
+    if (!currentContext) {
+        return '';
+    }
+    return currentContext.context.namespace || 'default';
 }
 
 async function customizeAsync(node: k8s.ClusterExplorerV1.ClusterExplorerResourceNode, treeItem: vscode.TreeItem): Promise<void> {

src/k8s/common.ts

@@ -32,13 +32,13 @@ export async function selectResourceByName(config: Promise<QuickPickItem[]> | Qu
 }
 
 export async function getChildrenNode(command: CommandText, kind: string, abbreviation: string): Promise<k8s.ClusterExplorerV1.Node[]> {
-    const kubectl = await k8s.extension.kubectl.v1;
-    if (kubectl.available) {
-        const result = await kubectl.api.invokeCommand(`${command}`);
+    try {
+        const result = await CliChannel.getInstance().executeTool(new CommandText('oc', `${command}`));
         const builds = result.stdout.split('\n')
             .filter((value) => value !== '')
             .map<Node>((item: string) => new Node(item.split(',')[0], item.split(',')[1], Number.parseInt(item.split(',')[2], 10), kind, abbreviation));
         return builds;
+    } catch (error) {
+        return [];
     }
-    return [];
 }

src/serverlessFunction/knative.ts

@@ -3,24 +3,21 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
-import * as k8s from 'vscode-kubernetes-tools-api';
+import { CommandText } from '../base/command';
+import { CliChannel } from '../cli';
 
 /**
  * Returns true if the cluster has the Knative Serving CRDs, and false otherwise.
  *
  * @returns true if the cluster has the Knative Serving CRDs, and false otherwise
  */
 export async function isKnativeServingAware(): Promise<boolean> {
-    const kubectl = await k8s.extension.kubectl.v1;
-    let isKnative = false;
-    if (kubectl.available) {
-        const sr = await kubectl.api.invokeCommand('api-versions');
-        isKnative =
-            sr &&
-            sr.code === 0 &&
-            (sr.stdout.includes('serving.knative.dev/v1') ||
-                sr.stdout.includes('serving.knative.dev/v1alpha1') ||
-                sr.stdout.includes('serving.knative.dev/v1beta1'));
+    try {
+        const stdout = await CliChannel.getInstance().executeSyncTool(new CommandText('oc', 'api-versions'), { timeout: 5000 });
+        return stdout.includes('serving.knative.dev/v1') ||
+            stdout.includes('serving.knative.dev/v1alpha1') ||
+            stdout.includes('serving.knative.dev/v1beta1')
+    } catch(error) {
+        return false;
     }
-    return isKnative;
 }

src/tekton/tekton.ts

@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
-import * as k8s from 'vscode-kubernetes-tools-api';
+import { CommandText } from '../base/command';
+import { CliChannel } from '../cli';
 
 /**
  * Returns true if the cluster has the Tekton CRDs, and false otherwise.
  *
  * @returns true if the cluster has the Tekton CRDs, and false otherwise
  */
 export async function isTektonAware(): Promise<boolean> {
-    const kubectl = await k8s.extension.kubectl.v1;
-    let isTekton = false;
-    if (kubectl.available) {
-        const sr = await kubectl.api.invokeCommand('api-versions');
-        isTekton = sr && sr.code === 0 && sr.stdout.includes('tekton.dev/v1beta1');
+    try {
+        const stdout = await CliChannel.getInstance().executeSyncTool(new CommandText('oc', 'api-versions'), { timeout: 5000 });
+        return stdout.includes('tekton.dev/v1beta1');
+    } catch(error) {
+        return false;
     }
-    return isTekton;
 }

src/util/kubeUtils.ts

@@ -9,7 +9,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { QuickPickItem, window } from 'vscode';
 import { Platform } from './platform';
-import * as k8s from 'vscode-kubernetes-tools-api';
+import { CommandText } from '../base/command';
+import { CliChannel } from '../cli';
 
 function fileExists(file: string): boolean {
     try {
@@ -184,13 +185,12 @@ export async function setKubeConfig(): Promise<void> {
 }
 
 export async function isOpenShift(): Promise<boolean> {
-    const kubectl = await k8s.extension.kubectl.v1;
-    let isOS = false;
-    if (kubectl.available) {
-        const sr = await kubectl.api.invokeCommand('api-versions');
-        isOS = sr && sr.code === 0 && sr.stdout.includes('apps.openshift.io/v1');
+    try {
+        const stdout = await CliChannel.getInstance().executeSyncTool(new CommandText('oc', 'api-versions'), { timeout: 5000 });
+        return stdout.includes('apps.openshift.io/v1');
+    } catch(error) {
+        return false;
     }
-    return isOS;
   }
 
   export async function getNamespaceKind(): Promise<string> {