k8s force exit after cleanup for now
parent
0eef3b325c
commit
d0de6c2b45
|
|
@ -1900,6 +1900,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|||
};
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
const k8s = __importStar(__webpack_require__(89679));
|
||||
const __1 = __webpack_require__(41359);
|
||||
const core = __importStar(__webpack_require__(42186));
|
||||
const kubernetes_storage_1 = __importDefault(__webpack_require__(43951));
|
||||
const kubernetes_task_runner_1 = __importDefault(__webpack_require__(7181));
|
||||
|
|
@ -2025,18 +2026,17 @@ class Kubernetes {
|
|||
catch (_a) { }
|
||||
});
|
||||
}
|
||||
cleanupSharedResources(
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildGuid,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildParameters,
|
||||
cleanupSharedResources(buildGuid, buildParameters,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
branchName,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
defaultSecretsArray) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
cloud_runner_logger_1.default.log(`deleting PVC`);
|
||||
return this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
|
||||
yield this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
|
||||
yield __1.Output.setBuildVersion(buildParameters.buildVersion);
|
||||
// eslint-disable-next-line unicorn/no-process-exit
|
||||
process.exit();
|
||||
});
|
||||
}
|
||||
static findPodFromJob(kubeClient, jobName, namespace) {
|
||||
|
|
@ -2256,12 +2256,7 @@ class KubernetesSecret {
|
|||
for (const buildSecret of secrets) {
|
||||
secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue);
|
||||
}
|
||||
try {
|
||||
yield kubeClient.createNamespacedSecret(namespace, secret);
|
||||
}
|
||||
catch (error) {
|
||||
throw error;
|
||||
}
|
||||
return kubeClient.createNamespacedSecret(namespace, secret);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -2315,12 +2310,7 @@ class KubernetesServiceAccount {
|
|||
name: serviceAccountName,
|
||||
};
|
||||
serviceAccount.automountServiceAccountToken = false;
|
||||
try {
|
||||
yield kubeClient.createNamespacedServiceAccount(namespace, serviceAccount);
|
||||
}
|
||||
catch (error) {
|
||||
throw error;
|
||||
}
|
||||
return kubeClient.createNamespacedServiceAccount(namespace, serviceAccount);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
import * as k8s from '@kubernetes/client-node';
|
||||
import { BuildParameters } from '../..';
|
||||
import { BuildParameters, Output } from '../..';
|
||||
import * as core from '@actions/core';
|
||||
import { CloudRunnerProviderInterface } from '../services/cloud-runner-provider-interface';
|
||||
import CloudRunnerSecret from '../services/cloud-runner-secret';
|
||||
|
|
@ -171,9 +171,7 @@ class Kubernetes implements CloudRunnerProviderInterface {
|
|||
}
|
||||
|
||||
async cleanupSharedResources(
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildGuid: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildParameters: BuildParameters,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
branchName: string,
|
||||
|
|
@ -181,7 +179,10 @@ class Kubernetes implements CloudRunnerProviderInterface {
|
|||
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
|
||||
) {
|
||||
CloudRunnerLogger.log(`deleting PVC`);
|
||||
return this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
|
||||
await this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
|
||||
await Output.setBuildVersion(buildParameters.buildVersion);
|
||||
// eslint-disable-next-line unicorn/no-process-exit
|
||||
process.exit();
|
||||
}
|
||||
|
||||
static async findPodFromJob(kubeClient: CoreV1Api, jobName: string, namespace: string) {
|
||||
|
|
|
|||
|
|
@ -21,11 +21,7 @@ class KubernetesSecret {
|
|||
for (const buildSecret of secrets) {
|
||||
secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue);
|
||||
}
|
||||
try {
|
||||
await kubeClient.createNamespacedSecret(namespace, secret);
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
return kubeClient.createNamespacedSecret(namespace, secret);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,7 @@ class KubernetesServiceAccount {
|
|||
name: serviceAccountName,
|
||||
};
|
||||
serviceAccount.automountServiceAccountToken = false;
|
||||
try {
|
||||
await kubeClient.createNamespacedServiceAccount(namespace, serviceAccount);
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
return kubeClient.createNamespacedServiceAccount(namespace, serviceAccount);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue