ci: [sync] Push chectl @ main to devspaces-chectl @ devspaces-3-rhel-9

Signed-off-by: devspacesbuild <[email protected]>

Author: devspacesbuild

package.json

@@ -116,7 +116,7 @@
     }
   },
   "dependencies": {
-    "@kubernetes/client-node": "0.14.3",
+    "@kubernetes/client-node": "0.22.3",
     "@oclif/core": "^3.0.4",
     "@oclif/parser": "^3.8.17",
     "@oclif/plugin-autocomplete": "^2.3.9",
@@ -127,7 +127,7 @@
     "@octokit/rest": "^19.0.5",
     "analytics-node": "^6.2.0",
     "ansi-colors": "4.1.3",
-    "axios": "^0.21.1",
+    "axios": "^1.8.4",
     "cli-ux": "^6.0.9",
     "command-exists": "^1.2.9",
     "countries-and-timezones": "^3.6.0",

src/api/che-logs-reader.ts

@@ -124,7 +124,7 @@ export class CheLogsReader {
       return []
     }
 
-    return pod.status.containerStatuses.map(containerStatus => containerStatus.name)
+    return pod.status.containerStatuses.filter(s => s.ready).map(s => s.name)
   }
 
   /**

src/api/kube-client.ts

@@ -112,7 +112,12 @@ export class KubeClient {
           rejectUnauthorized: false,
           requestCert: true,
         }),
-        headers: token && {Authorization: 'bearer ' + token},
+      }
+
+      if (token) {
+        config.headers = {
+          Authorization: `Bearer ${token}`,
+        }
       }
 
       const response = await axios.get(`${endpoint}`, config)
@@ -1189,17 +1194,31 @@ export class KubeClient {
 
   async listClusterCustomObject(resourceAPIGroup: string, resourceAPIVersion: string, resourcePlural: string): Promise<any[]> {
     const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
-    try {
-      const {body} = await customObjectsApi.listClusterCustomObject(resourceAPIGroup, resourceAPIVersion, resourcePlural)
-      return (body as any).items ? (body as any).items : []
-    } catch (e: any) {
-      if (e.response && e.response.statusCode === 404) {
-        // There is no CRD
-        return []
-      }
 
-      throw this.wrapK8sClientError(e)
+    for (let attempt = 1; attempt <= 10; attempt++) {
+      try {
+        const { body } = await customObjectsApi.listClusterCustomObject(
+          resourceAPIGroup,
+          resourceAPIVersion,
+          resourcePlural
+        )
+        return (body as any).items ? (body as any).items : []
+      } catch (e: any) {
+        if (e.response?.statusCode === 404) {
+          return []
+        }
+
+        const wrappedError = this.wrapK8sClientError(e)
+        if (this.isStorageIsReInitializingError(wrappedError)) {
+          await ux.wait(1000)
+          continue
+        }
+
+        throw wrappedError
+      }
     }
+
+    throw new Error('Exceeded maximum retry attempts to list cluster custom object: storage is (re)initializing')
   }
 
   async isCatalogSourceExists(name: string, namespace: string): Promise<boolean> {
@@ -1216,16 +1235,6 @@ export class KubeClient {
     }
   }
 
-  async listCatalogSource(namespace: string, labelSelector: string): Promise<CatalogSource[]> {
-    const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
-    try {
-      const {body} = await customObjectsApi.listNamespacedCustomObject('operators.coreos.com', 'v1alpha1', namespace, 'catalogsources', undefined, undefined, undefined, labelSelector)
-      return (body as any).items as CatalogSource[]
-    } catch (e: any) {
-      throw this.wrapK8sClientError(e)
-    }
-  }
-
   async getCatalogSource(name: string, namespace: string): Promise<CatalogSource | undefined> {
     const customObjectsApi = this.kubeConfig.makeApiClient(CustomObjectsApi)
     try {
@@ -1914,6 +1923,11 @@ export class KubeClient {
       msg.includes('failed calling webhook') ||
       msg.includes('conversion webhook')
   }
+
+  private isStorageIsReInitializingError(error: any): boolean {
+    const msg = error.message as string
+    return msg.includes('storage is (re)initializing') || msg.includes('TooManyRequests')
+  }
 }
 
 class PatchedK8sAppsApi extends AppsV1Api {