fix k8s isodate
parent
8180d76b1b
commit
ae0804b5c7
|
|
@ -852,7 +852,7 @@ class CloudRunnerOptions {
|
||||||
return CloudRunnerOptions.getInput('kubeVolume') || '';
|
return CloudRunnerOptions.getInput('kubeVolume') || '';
|
||||||
}
|
}
|
||||||
static get kubeVolumeSize() {
|
static get kubeVolumeSize() {
|
||||||
return CloudRunnerOptions.getInput('kubeVolumeSize') || '15Gi';
|
return CloudRunnerOptions.getInput('kubeVolumeSize') || '25Gi';
|
||||||
}
|
}
|
||||||
static get kubeStorageClass() {
|
static get kubeStorageClass() {
|
||||||
return CloudRunnerOptions.getInput('kubeStorageClass') || '';
|
return CloudRunnerOptions.getInput('kubeStorageClass') || '';
|
||||||
|
|
@ -3761,10 +3761,21 @@ class KubernetesTaskRunner {
|
||||||
let didStreamAnyLogs = false;
|
let didStreamAnyLogs = false;
|
||||||
let shouldReadLogs = true;
|
let shouldReadLogs = true;
|
||||||
let shouldCleanup = true;
|
let shouldCleanup = true;
|
||||||
|
const currentDate = new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1);
|
||||||
|
const dateTimeIsoString = currentDate.toISOString();
|
||||||
|
// k8s compatible iso date format - split by dot - https://www.googlecloudcommunity.com/gc/Apigee/JS-for-current-timestamp-in-W3C-WSDL-date-format-YYYY-MM-DDThh/td-p/68415
|
||||||
|
const currentDateTime = dateTimeIsoString.split('.')[0];
|
||||||
|
const timeZoneOffset = currentDate.getTimezoneOffset();
|
||||||
|
const positiveOffset = Math.abs(timeZoneOffset);
|
||||||
|
const timeOffsetInHours = -(timeZoneOffset / 60);
|
||||||
|
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
||||||
|
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
||||||
|
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
||||||
|
const minOffset = minZone < 10 ? 0 : '';
|
||||||
|
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
||||||
|
const dateTZDformat = currentDateTime + tzd;
|
||||||
try {
|
try {
|
||||||
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp
|
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp ? `--since-time="${dateTZDformat}" ` : ` `;
|
||||||
? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" `
|
|
||||||
: ` `;
|
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = false;
|
let lastMessageSeen = false;
|
||||||
// using this instead of Kube
|
// using this instead of Kube
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -208,7 +208,7 @@ class CloudRunnerOptions {
|
||||||
}
|
}
|
||||||
|
|
||||||
static get kubeVolumeSize(): string {
|
static get kubeVolumeSize(): string {
|
||||||
return CloudRunnerOptions.getInput('kubeVolumeSize') || '15Gi';
|
return CloudRunnerOptions.getInput('kubeVolumeSize') || '25Gi';
|
||||||
}
|
}
|
||||||
|
|
||||||
static get kubeStorageClass(): string {
|
static get kubeStorageClass(): string {
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,23 @@ class KubernetesTaskRunner {
|
||||||
let didStreamAnyLogs: boolean = false;
|
let didStreamAnyLogs: boolean = false;
|
||||||
let shouldReadLogs = true;
|
let shouldReadLogs = true;
|
||||||
let shouldCleanup = true;
|
let shouldCleanup = true;
|
||||||
|
const currentDate = new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1);
|
||||||
|
const dateTimeIsoString = currentDate.toISOString();
|
||||||
|
|
||||||
|
// k8s compatible iso date format - split by dot - https://www.googlecloudcommunity.com/gc/Apigee/JS-for-current-timestamp-in-W3C-WSDL-date-format-YYYY-MM-DDThh/td-p/68415
|
||||||
|
const currentDateTime = dateTimeIsoString.split('.')[0];
|
||||||
|
const timeZoneOffset = currentDate.getTimezoneOffset();
|
||||||
|
const positiveOffset = Math.abs(timeZoneOffset);
|
||||||
|
const timeOffsetInHours = -(timeZoneOffset / 60);
|
||||||
|
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
||||||
|
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
||||||
|
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
||||||
|
const minOffset = minZone < 10 ? 0 : '';
|
||||||
|
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
||||||
|
const dateTZDformat = currentDateTime + tzd;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp
|
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp ? `--since-time="${dateTZDformat}" ` : ` `;
|
||||||
? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" `
|
|
||||||
: ` `;
|
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = false;
|
let lastMessageSeen = false;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue