From d79999472363f9408413dea98aa840fe2ab83f50 Mon Sep 17 00:00:00 2001 From: shuangkun Date: Tue, 12 Mar 2024 17:07:59 +0800 Subject: [PATCH 1/5] fix: Incorrect message on UI when podGC is enabled with deleteDelayDuration. Fixes: #12395 Signed-off-by: shuangkun --- .../workflow-logs-viewer/workflow-logs-viewer.tsx | 7 ++++++- ui/src/models/workflows.ts | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index 8c430c49e63a..c97121f4e507 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -295,10 +295,15 @@ export function WorkflowLogsViewer({workflow, nodeId, initialPodName, container, logs from the artifacts. )} - {execSpec(workflow).podGC && ( + {execSpec(workflow).podGC && !execSpec(workflow).podGC.deleteDelayDuration && ( <> Your pod GC settings will delete pods and their logs immediately on completion. + )} + {execSpec(workflow).podGC && execSpec(workflow).podGC.deleteDelayDuration && ( + <> + Your pod GC settings will delete pods and their logs after {execSpec(workflow).podGC.deleteDelayDuration} on completion. + )}{' '} Logs may not appear for pods that are deleted.{' '} {podName ? ( diff --git a/ui/src/models/workflows.ts b/ui/src/models/workflows.ts index b46440f631fb..8acf9178bb99 100644 --- a/ui/src/models/workflows.ts +++ b/ui/src/models/workflows.ts @@ -825,6 +825,7 @@ export interface WorkflowSpec { */ podGC?: { strategy?: string; + deleteDelayDuration?: string; }; /** * SecurityContext holds pod-level security attributes and common container settings. From 890cff8d45746715bbd90854bfbbf1073c4ac826 Mon Sep 17 00:00:00 2001 From: shuangkun tian <72060326+shuangkun@users.noreply.github.com> Date: Tue, 12 Mar 2024 23:21:01 +0800 Subject: [PATCH 2/5] Update ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> Signed-off-by: shuangkun tian <72060326+shuangkun@users.noreply.github.com> --- .../workflow-logs-viewer/workflow-logs-viewer.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index c97121f4e507..08f086263814 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -295,15 +295,11 @@ export function WorkflowLogsViewer({workflow, nodeId, initialPodName, container, logs from the artifacts. )} - {execSpec(workflow).podGC && !execSpec(workflow).podGC.deleteDelayDuration && ( + {execSpec(workflow).podGC && ( <> - Your pod GC settings will delete pods and their logs immediately on completion. + Your pod GC settings will delete pods and their logs {execSpec(workflow).podGC.deleteDelayDuration ? "after ${execSpec(workflow).podGC.deleteDelayDuration}" : "immediately"} on completion. )} - {execSpec(workflow).podGC && execSpec(workflow).podGC.deleteDelayDuration && ( - <> - Your pod GC settings will delete pods and their logs after {execSpec(workflow).podGC.deleteDelayDuration} on completion. - )}{' '} Logs may not appear for pods that are deleted.{' '} {podName ? ( From 899dec75289b69cc56e42b050e887daea27b6735 Mon Sep 17 00:00:00 2001 From: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:29:11 -0400 Subject: [PATCH 3/5] Update ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> --- .../components/workflow-logs-viewer/workflow-logs-viewer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index 08f086263814..e5fd724393be 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -297,7 +297,7 @@ export function WorkflowLogsViewer({workflow, nodeId, initialPodName, container, )} {execSpec(workflow).podGC && ( <> - Your pod GC settings will delete pods and their logs {execSpec(workflow).podGC.deleteDelayDuration ? "after ${execSpec(workflow).podGC.deleteDelayDuration}" : "immediately"} on completion. + Your pod GC settings will delete pods and their logs {execSpec(workflow).podGC.deleteDelayDuration ? `after ${execSpec(workflow).podGC.deleteDelayDuration}` : "immediately"} on completion. )} )}{' '} From 1216227333534feedade4fdaa6fc0dd167210779 Mon Sep 17 00:00:00 2001 From: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:29:19 -0400 Subject: [PATCH 4/5] Update ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> --- .../components/workflow-logs-viewer/workflow-logs-viewer.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index e5fd724393be..a569c668f22a 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -299,7 +299,6 @@ export function WorkflowLogsViewer({workflow, nodeId, initialPodName, container, <> Your pod GC settings will delete pods and their logs {execSpec(workflow).podGC.deleteDelayDuration ? `after ${execSpec(workflow).podGC.deleteDelayDuration}` : "immediately"} on completion. - )} )}{' '} Logs may not appear for pods that are deleted.{' '} {podName ? ( From 28229cd0014c43178ca1e54ef4279ceda52d183a Mon Sep 17 00:00:00 2001 From: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:36:36 -0400 Subject: [PATCH 5/5] Update ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> --- .../components/workflow-logs-viewer/workflow-logs-viewer.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index a569c668f22a..45f09c7b315b 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -297,7 +297,8 @@ export function WorkflowLogsViewer({workflow, nodeId, initialPodName, container, )} {execSpec(workflow).podGC && ( <> - Your pod GC settings will delete pods and their logs {execSpec(workflow).podGC.deleteDelayDuration ? `after ${execSpec(workflow).podGC.deleteDelayDuration}` : "immediately"} on completion. + Your pod GC settings will delete pods and their logs{' '} + {execSpec(workflow).podGC.deleteDelayDuration ? `after ${execSpec(workflow).podGC.deleteDelayDuration}` : 'immediately'} on completion. )}{' '} Logs may not appear for pods that are deleted.{' '}