cleanup
parent
623d40a1da
commit
3046c521a8
|
|
@ -2993,6 +2993,7 @@ 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));
|
||||||
|
|
@ -3042,9 +3043,12 @@ class Kubernetes {
|
||||||
defaultSecretsArray) {
|
defaultSecretsArray) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
this.pvcName = `unity-builder-pvc-${buildGuid}`;
|
const id = buildParameters.retainWorkspace && __1.CloudRunner.lockedWorkspace
|
||||||
this.cleanupCronJobName = `unity-builder-cronjob-${buildGuid}`;
|
? __1.CloudRunner.lockedWorkspace
|
||||||
this.serviceAccountName = `service-account-${buildGuid}`;
|
: buildParameters.buildGuid;
|
||||||
|
this.pvcName = `unity-builder-pvc-${id}`;
|
||||||
|
this.cleanupCronJobName = `unity-builder-cronjob-${id}`;
|
||||||
|
this.serviceAccountName = `service-account-${id}`;
|
||||||
yield kubernetes_storage_1.default.createPersistentVolumeClaim(buildParameters, this.pvcName, this.kubeClient, this.namespace);
|
yield kubernetes_storage_1.default.createPersistentVolumeClaim(buildParameters, this.pvcName, this.kubeClient, this.namespace);
|
||||||
yield kubernetes_service_account_1.default.createServiceAccount(this.serviceAccountName, this.namespace, this.kubeClient);
|
yield kubernetes_service_account_1.default.createServiceAccount(this.serviceAccountName, this.namespace, this.kubeClient);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
||||||
import * as k8s from '@kubernetes/client-node';
|
import * as k8s from '@kubernetes/client-node';
|
||||||
import { BuildParameters } from '../../..';
|
import { BuildParameters, CloudRunner } 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';
|
||||||
|
|
@ -64,9 +64,13 @@ class Kubernetes implements ProviderInterface {
|
||||||
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
|
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
this.pvcName = `unity-builder-pvc-${buildGuid}`;
|
const id =
|
||||||
this.cleanupCronJobName = `unity-builder-cronjob-${buildGuid}`;
|
buildParameters.retainWorkspace && CloudRunner.lockedWorkspace
|
||||||
this.serviceAccountName = `service-account-${buildGuid}`;
|
? CloudRunner.lockedWorkspace
|
||||||
|
: buildParameters.buildGuid;
|
||||||
|
this.pvcName = `unity-builder-pvc-${id}`;
|
||||||
|
this.cleanupCronJobName = `unity-builder-cronjob-${id}`;
|
||||||
|
this.serviceAccountName = `service-account-${id}`;
|
||||||
await KubernetesStorage.createPersistentVolumeClaim(
|
await KubernetesStorage.createPersistentVolumeClaim(
|
||||||
buildParameters,
|
buildParameters,
|
||||||
this.pvcName,
|
this.pvcName,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue