[CloudRunner] actions yaml descriptions

pull/437/head
Frostebite 2022-10-23 01:12:46 +01:00
parent 3774a9c92d
commit 1f69dd691a
4 changed files with 12 additions and 18 deletions

16
dist/index.js vendored
View File

@ -3033,7 +3033,7 @@ class Kubernetes {
this.secretName = `build-credentials-${this.buildGuid}`; this.secretName = `build-credentials-${this.buildGuid}`;
this.jobName = `unity-builder-job-${this.buildGuid}`; this.jobName = `unity-builder-job-${this.buildGuid}`;
this.containerName = `main`; this.containerName = `main`;
yield this.createSecret(secrets); yield kubernetes_secret_1.default.createSecret(secrets, this.secretName, this.namespace, this.kubeClient);
yield this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets); yield this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
this.setPodNameAndContainerName(yield Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace)); this.setPodNameAndContainerName(yield Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace));
cloud_runner_logger_1.default.log('Watching pod until running'); cloud_runner_logger_1.default.log('Watching pod until running');
@ -3067,13 +3067,6 @@ class Kubernetes {
} }
}); });
} }
createSecret(secrets) {
return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.log(`Secret creating`);
yield kubernetes_secret_1.default.createSecret(secrets, this.secretName, this.namespace, this.kubeClient);
cloud_runner_logger_1.default.log(`Secret created`);
});
}
createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets) { createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
for (let index = 0; index < 3; index++) { for (let index = 0; index < 3; index++) {
@ -3362,8 +3355,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next()); step((generator = generator.apply(thisArg, _arguments || [])).next());
}); });
}; };
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": 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 cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
const base64 = __nccwpck_require__(85848); const base64 = __nccwpck_require__(85848);
class KubernetesSecret { class KubernetesSecret {
static createSecret(secrets, secretName, namespace, kubeClient) { static createSecret(secrets, secretName, namespace, kubeClient) {
@ -3379,7 +3376,8 @@ class KubernetesSecret {
for (const buildSecret of secrets) { for (const buildSecret of secrets) {
secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue); secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue);
} }
return kubeClient.createNamespacedSecret(namespace, secret); cloud_runner_logger_1.default.log('Creating secret');
return yield kubeClient.createNamespacedSecret(namespace, secret);
}); });
} }
} }

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -113,7 +113,7 @@ class Kubernetes implements ProviderInterface {
this.secretName = `build-credentials-${this.buildGuid}`; this.secretName = `build-credentials-${this.buildGuid}`;
this.jobName = `unity-builder-job-${this.buildGuid}`; this.jobName = `unity-builder-job-${this.buildGuid}`;
this.containerName = `main`; this.containerName = `main`;
await this.createSecret(secrets); await KubernetesSecret.createSecret(secrets, this.secretName, this.namespace, this.kubeClient);
await this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets); await this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
this.setPodNameAndContainerName(await Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace)); this.setPodNameAndContainerName(await Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace));
CloudRunnerLogger.log('Watching pod until running'); CloudRunnerLogger.log('Watching pod until running');
@ -152,12 +152,6 @@ class Kubernetes implements ProviderInterface {
} }
} }
private async createSecret(secrets: CloudRunnerSecret[]) {
CloudRunnerLogger.log(`Secret creating`);
await KubernetesSecret.createSecret(secrets, this.secretName, this.namespace, this.kubeClient);
CloudRunnerLogger.log(`Secret created`);
}
private async createNamespacedJob( private async createNamespacedJob(
commands: string, commands: string,
image: string, image: string,

View File

@ -1,6 +1,7 @@
import { CoreV1Api } from '@kubernetes/client-node'; import { CoreV1Api } from '@kubernetes/client-node';
import CloudRunnerSecret from '../../services/cloud-runner-secret'; import CloudRunnerSecret from '../../services/cloud-runner-secret';
import * as k8s from '@kubernetes/client-node'; import * as k8s from '@kubernetes/client-node';
import CloudRunnerLogger from '../../services/cloud-runner-logger';
const base64 = require('base-64'); const base64 = require('base-64');
class KubernetesSecret { class KubernetesSecret {
@ -21,8 +22,9 @@ class KubernetesSecret {
for (const buildSecret of secrets) { for (const buildSecret of secrets) {
secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue); secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue);
} }
CloudRunnerLogger.log('Creating secret');
return kubeClient.createNamespacedSecret(namespace, secret); return await kubeClient.createNamespacedSecret(namespace, secret);
} }
} }