actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

K8s log and stringify error for k8s cleanup

pull/461/head
Frostebite 2022-09-29 19:57:34 +01:00
parent a0eda4ad1d
commit 026f8f20a4
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -2849,7 +2849,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
const k8s = __importStar(__nccwpck_require__(89679)); const k8s = __importStar(__nccwpck_require__(89679));
const __1 = __nccwpck_require__(41359);
const core = __importStar(__nccwpck_require__(42186)); const core = __importStar(__nccwpck_require__(42186));
const kubernetes_storage_1 = __importDefault(__nccwpck_require__(49043)); const kubernetes_storage_1 = __importDefault(__nccwpck_require__(49043));
const kubernetes_task_runner_1 = __importDefault(__nccwpck_require__(70801)); const kubernetes_task_runner_1 = __importDefault(__nccwpck_require__(70801));
@ -2971,7 +2970,7 @@ class Kubernetes {
yield new Promise((promise) => setTimeout(promise, 5000)); yield new Promise((promise) => setTimeout(promise, 5000));
} }
catch (error) { catch (error) {
if (error.response.body.message.endsWith(`not found`)) { if (error.response.body.reason === `not found`) {
return; return;
} }
cloud_runner_logger_1.default.log('Failed to cleanup, error:'); cloud_runner_logger_1.default.log('Failed to cleanup, error:');
@ -2994,7 +2993,11 @@ class Kubernetes {
catch (_a) { } catch (_a) { }
}); });
} }
cleanup(buildGuid, buildParameters, cleanup(
// eslint-disable-next-line no-unused-vars
buildGuid,
// eslint-disable-next-line no-unused-vars
buildParameters,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
branchName, branchName,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -3005,12 +3008,11 @@ class Kubernetes {
yield this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace); yield this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
} }
catch (error) { catch (error) {
if (error.response.body.message.endsWith(`not found`)) { if (error.response.body.reason === `not found`) {
return; return;
} }
cloud_runner_logger_1.default.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`); cloud_runner_logger_1.default.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`);
} }
yield __1.Output.setBuildVersion(buildParameters.buildVersion);
}); });
} }
static findPodFromJob(kubeClient, jobName, namespace) { static findPodFromJob(kubeClient, jobName, namespace) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

9
src/model/cloud-runner/providers/k8s/index.ts
View File

@ -1,5 +1,5 @@
import * as k8s from '@kubernetes/client-node'; import * as k8s from '@kubernetes/client-node';
import { BuildParameters, Output } from '../../..'; import { BuildParameters } from '../../..';
import * as core from '@actions/core'; import * as core from '@actions/core';
import { ProviderInterface } from '../provider-interface'; import { ProviderInterface } from '../provider-interface';
import CloudRunnerSecret from '../../services/cloud-runner-secret'; import CloudRunnerSecret from '../../services/cloud-runner-secret';
@ -166,7 +166,7 @@ class Kubernetes implements ProviderInterface {
await this.kubeClient.deleteNamespacedSecret(this.secretName, this.namespace); await this.kubeClient.deleteNamespacedSecret(this.secretName, this.namespace);
await new Promise((promise) => setTimeout(promise, 5000)); await new Promise((promise) => setTimeout(promise, 5000));
} catch (error: any) { } catch (error: any) {
if (error.response.body.message.endsWith(`not found`)) { if (error.response.body.reason === `not found`) {
return; return;
} }
CloudRunnerLogger.log('Failed to cleanup, error:'); CloudRunnerLogger.log('Failed to cleanup, error:');
@ -192,7 +192,9 @@ class Kubernetes implements ProviderInterface {
} }
async cleanup( async cleanup(
// eslint-disable-next-line no-unused-vars
buildGuid: string, buildGuid: string,
// eslint-disable-next-line no-unused-vars
buildParameters: BuildParameters, buildParameters: BuildParameters,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
branchName: string, branchName: string,
@ -204,12 +206,11 @@ class Kubernetes implements ProviderInterface {
try { try {
await this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace); await this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
} catch (error: any) { } catch (error: any) {
if (error.response.body.message.endsWith(`not found`)) { if (error.response.body.reason === `not found`) {
return; return;
} }
CloudRunnerLogger.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`); CloudRunnerLogger.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`);
} }
await Output.setBuildVersion(buildParameters.buildVersion);
} }
static async findPodFromJob(kubeClient: CoreV1Api, jobName: string, namespace: string) { static async findPodFromJob(kubeClient: CoreV1Api, jobName: string, namespace: string) {