aws/k8s smoke test
parent
22c14f5b5f
commit
2f91bba5c6
|
@ -3340,18 +3340,15 @@ class Kubernetes {
|
|||
}
|
||||
if (!existsAlready || ((_b = status.state) === null || _b === void 0 ? void 0 : _b.terminated) !== undefined) {
|
||||
cloud_runner_logger_1.default.log('Job does not exist');
|
||||
yield this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
const find = yield Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace);
|
||||
this.setPodNameAndContainerName(find);
|
||||
yield this.createJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
cloud_runner_logger_1.default.log('Watching pod until running');
|
||||
yield kubernetes_task_runner_1.default.watchUntilPodRunning(this.kubeClient, this.podName, this.namespace);
|
||||
}
|
||||
cloud_runner_logger_1.default.log('Pod running, streaming logs');
|
||||
output += yield kubernetes_task_runner_1.default.runTask(this.kubeConfig, this.kubeClient, this.jobName, this.podName, 'main', this.namespace);
|
||||
const running = yield kubernetes_pods_1.default.IsPodRunning(this.podName, this.namespace, this.kubeClient);
|
||||
if (!running) {
|
||||
output += yield kubernetes_task_runner_1.default.runTask(this.kubeConfig, this.kubeClient, this.jobName, this.podName, 'main', this.namespace, running);
|
||||
status = yield kubernetes_pods_1.default.GetPodStatus(this.podName, this.namespace, this.kubeClient);
|
||||
cloud_runner_logger_1.default.log(`Pod not found, assumed ended!`);
|
||||
if (!running) {
|
||||
if (!follow_log_stream_service_1.FollowLogStreamService.DidReceiveEndOfTransmission && status === `Succeeded`) {
|
||||
output += yield kubernetes_task_runner_1.default.runTask(this.kubeConfig, this.kubeClient, this.jobName, this.podName, 'main', this.namespace, true);
|
||||
break;
|
||||
|
@ -3360,9 +3357,7 @@ class Kubernetes {
|
|||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
cloud_runner_logger_1.default.log('Pod still running, recovering stream...');
|
||||
}
|
||||
cloud_runner_logger_1.default.log(`Pod status ${status}, retrying log stream...`);
|
||||
}
|
||||
catch (error) {
|
||||
let errorParsed;
|
||||
|
@ -3401,6 +3396,13 @@ class Kubernetes {
|
|||
}
|
||||
});
|
||||
}
|
||||
createJob(commands, image, mountdir, workingdir, environment, secrets) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
yield this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
const find = yield Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace);
|
||||
this.setPodNameAndContainerName(find);
|
||||
});
|
||||
}
|
||||
doesJobExist(name) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const jobs = yield this.kubeClientBatch.listNamespacedJob(this.namespace);
|
||||
|
@ -4103,7 +4105,8 @@ class KubernetesTaskRunner {
|
|||
stream.destroy();
|
||||
}
|
||||
cloud_runner_logger_1.default.log('k8s task runner failed');
|
||||
cloud_runner_logger_1.default.log(JSON.stringify(((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.body) || error, undefined, 4));
|
||||
cloud_runner_logger_1.default.log(JSON.stringify((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.body, undefined, 4));
|
||||
cloud_runner_logger_1.default.log(JSON.stringify(error, undefined, 4));
|
||||
}
|
||||
cloud_runner_logger_1.default.log('end of log stream');
|
||||
return output;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -145,13 +145,12 @@ class Kubernetes implements ProviderInterface {
|
|||
}
|
||||
if (!existsAlready || status.state?.terminated !== undefined) {
|
||||
CloudRunnerLogger.log('Job does not exist');
|
||||
await this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
const find = await Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace);
|
||||
this.setPodNameAndContainerName(find);
|
||||
await this.createJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
CloudRunnerLogger.log('Watching pod until running');
|
||||
await KubernetesTaskRunner.watchUntilPodRunning(this.kubeClient, this.podName, this.namespace);
|
||||
}
|
||||
CloudRunnerLogger.log('Pod running, streaming logs');
|
||||
const running = await KubernetesPods.IsPodRunning(this.podName, this.namespace, this.kubeClient);
|
||||
output += await KubernetesTaskRunner.runTask(
|
||||
this.kubeConfig,
|
||||
this.kubeClient,
|
||||
|
@ -159,12 +158,11 @@ class Kubernetes implements ProviderInterface {
|
|||
this.podName,
|
||||
'main',
|
||||
this.namespace,
|
||||
running,
|
||||
);
|
||||
const running = await KubernetesPods.IsPodRunning(this.podName, this.namespace, this.kubeClient);
|
||||
status = await KubernetesPods.GetPodStatus(this.podName, this.namespace, this.kubeClient);
|
||||
|
||||
if (!running) {
|
||||
status = await KubernetesPods.GetPodStatus(this.podName, this.namespace, this.kubeClient);
|
||||
CloudRunnerLogger.log(`Pod not found, assumed ended!`);
|
||||
if (!FollowLogStreamService.DidReceiveEndOfTransmission && status === `Succeeded`) {
|
||||
output += await KubernetesTaskRunner.runTask(
|
||||
this.kubeConfig,
|
||||
|
@ -181,9 +179,8 @@ class Kubernetes implements ProviderInterface {
|
|||
if (FollowLogStreamService.DidReceiveEndOfTransmission) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
CloudRunnerLogger.log('Pod still running, recovering stream...');
|
||||
}
|
||||
CloudRunnerLogger.log(`Pod status ${status}, retrying log stream...`);
|
||||
} catch (error: any) {
|
||||
let errorParsed;
|
||||
try {
|
||||
|
@ -223,6 +220,19 @@ class Kubernetes implements ProviderInterface {
|
|||
}
|
||||
}
|
||||
|
||||
private async createJob(
|
||||
commands: string,
|
||||
image: string,
|
||||
mountdir: string,
|
||||
workingdir: string,
|
||||
environment: CloudRunnerEnvironmentVariable[],
|
||||
secrets: CloudRunnerSecret[],
|
||||
) {
|
||||
await this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
|
||||
const find = await Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace);
|
||||
this.setPodNameAndContainerName(find);
|
||||
}
|
||||
|
||||
private async doesJobExist(name) {
|
||||
const jobs = await this.kubeClientBatch.listNamespacedJob(this.namespace);
|
||||
|
||||
|
|
|
@ -114,7 +114,8 @@ class KubernetesTaskRunner {
|
|||
stream.destroy();
|
||||
}
|
||||
CloudRunnerLogger.log('k8s task runner failed');
|
||||
CloudRunnerLogger.log(JSON.stringify(error?.response?.body || error, undefined, 4));
|
||||
CloudRunnerLogger.log(JSON.stringify(error?.response?.body, undefined, 4));
|
||||
CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
|
||||
}
|
||||
CloudRunnerLogger.log('end of log stream');
|
||||
|
||||
|
|
Loading…
Reference in New Issue