From 1c2ae5d20ad9c4553b75f0398f1c2d09c11a2a91 Mon Sep 17 00:00:00 2001 From: Nikola Jokic Date: Wed, 16 Apr 2025 14:25:04 +0200 Subject: [PATCH] rework --- packages/k8s/package-lock.json | 6 +++--- packages/k8s/package.json | 3 ++- packages/k8s/src/k8s/index.ts | 20 +++++++------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/packages/k8s/package-lock.json b/packages/k8s/package-lock.json index d94c951..e47babc 100644 --- a/packages/k8s/package-lock.json +++ b/packages/k8s/package-lock.json @@ -1606,9 +1606,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001713", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz", - "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==", + "version": "1.0.30001714", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001714.tgz", + "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==", "dev": true, "funding": [ { diff --git a/packages/k8s/package.json b/packages/k8s/package.json index 115c9d4..292fd5d 100644 --- a/packages/k8s/package.json +++ b/packages/k8s/package.json @@ -8,7 +8,8 @@ "build": "tsc && npx ncc build", "format": "prettier --write '**/*.ts'", "format-check": "prettier --check '**/*.ts'", - "lint": "eslint src/**/*.ts" + "lint": "eslint src/**/*.ts", + "lint:fix": "eslint src/**/*.ts --fix" }, "author": "", "license": "MIT", diff --git a/packages/k8s/src/k8s/index.ts b/packages/k8s/src/k8s/index.ts index 1b1a535..abf7622 100644 --- a/packages/k8s/src/k8s/index.ts +++ b/packages/k8s/src/k8s/index.ts @@ -200,6 +200,7 @@ export async function getContainerJobPodName(jobName: string): Promise { labelSelector: selector, limit: 1 }) + if (!podList.items?.length) { await backOffManager.backOff() continue @@ -362,7 +363,7 @@ export async function pruneSecrets(): Promise { await Promise.all( secretList.items.map( async secret => - secret.metadata?.name && (await deleteSecret(secret.metadata.name)) + secret.metadata?.name && deleteSecret(secret.metadata.name) ) ) } @@ -465,8 +466,7 @@ export async function getPodLogs( pretty: false, timestamps: false }) - - await new Promise(resolve => logStream.on('close', resolve)) + await new Promise(resolve => logStream.on('close', () => resolve(null))) } export async function prunePods(): Promise { @@ -480,7 +480,7 @@ export async function prunePods(): Promise { await Promise.all( podList.items.map( - async pod => pod.metadata?.name && (await deletePod(pod.metadata.name)) + async pod => pod.metadata?.name && deletePod(pod.metadata.name) ) ) } @@ -488,11 +488,8 @@ export async function prunePods(): Promise { export async function getPodStatus( name: string ): Promise { - const { status } = await k8sApi.readNamespacedPod({ - name, - namespace: namespace() - }) - return status + const pod = await k8sApi.readNamespacedPod({ name, namespace: namespace() }) + return pod.status } export async function isAuthPermissionsOK(): Promise { @@ -654,8 +651,5 @@ export function containerPorts( } export async function getPodByName(name): Promise { - return await k8sApi.readNamespacedPod({ - name, - namespace: namespace() - }) + return await k8sApi.readNamespacedPod({ name, namespace: namespace() }) }