fixes
parent
1dd6910b64
commit
42964bcf5d
|
|
@ -3328,6 +3328,7 @@ class KubernetesJobSpecFactory {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
job.spec = {
|
job.spec = {
|
||||||
|
ttlSecondsAfterFinished: 9999,
|
||||||
backoffLimit: 0,
|
backoffLimit: 0,
|
||||||
template: {
|
template: {
|
||||||
spec: {
|
spec: {
|
||||||
|
|
@ -3694,14 +3695,12 @@ class KubernetesTaskRunner {
|
||||||
sinceTime = ` --since-time="${dateTimeIsoString}"`;
|
sinceTime = ` --since-time="${dateTimeIsoString}"`;
|
||||||
}
|
}
|
||||||
let extraFlags = ``;
|
let extraFlags = ``;
|
||||||
extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))
|
extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient)) ? `` : ` -p`;
|
||||||
? ` -c ${containerName}`
|
|
||||||
: ` -p`;
|
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = false;
|
let lastMessageSeen = false;
|
||||||
let logs;
|
let logs;
|
||||||
try {
|
try {
|
||||||
logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`, false, true);
|
logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`, false, true);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
cloud_runner_logger_1.default.log(`K8s logging error ${error}`);
|
cloud_runner_logger_1.default.log(`K8s logging error ${error}`);
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -88,6 +88,7 @@ class KubernetesJobSpecFactory {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
job.spec = {
|
job.spec = {
|
||||||
|
ttlSecondsAfterFinished: 9999,
|
||||||
backoffLimit: 0,
|
backoffLimit: 0,
|
||||||
template: {
|
template: {
|
||||||
spec: {
|
spec: {
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,7 @@ class KubernetesTaskRunner {
|
||||||
sinceTime = ` --since-time="${dateTimeIsoString}"`;
|
sinceTime = ` --since-time="${dateTimeIsoString}"`;
|
||||||
}
|
}
|
||||||
let extraFlags = ``;
|
let extraFlags = ``;
|
||||||
extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))
|
extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient)) ? `` : ` -p`;
|
||||||
? ` -c ${containerName}`
|
|
||||||
: ` -p`;
|
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = false;
|
let lastMessageSeen = false;
|
||||||
|
|
||||||
|
|
@ -46,7 +44,7 @@ class KubernetesTaskRunner {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
logs = await CloudRunnerSystem.Run(
|
logs = await CloudRunnerSystem.Run(
|
||||||
`kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`,
|
`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`,
|
||||||
false,
|
false,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue