From d4feff4a72ef35840c2f1156d84e6b963557d664 Mon Sep 17 00:00:00 2001 From: nicholaskuechler Date: Thu, 15 Aug 2024 16:14:15 -0500 Subject: [PATCH 1/5] feat: Adds additional customization of Argo Workflows UI --- components/argo/include-columns | 7 +++++++ components/argo/include-links | 25 +++++++++++++++++++++++++ components/argo/kustomization.yaml | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 components/argo/include-columns create mode 100644 components/argo/include-links diff --git a/components/argo/include-columns b/components/argo/include-columns new file mode 100644 index 00000000..4fe17796 --- /dev/null +++ b/components/argo/include-columns @@ -0,0 +1,7 @@ +# Adds a column to the Workflow List View +- # The name of this column, e.g., "Workflow Completed". + name: Workflow Completed + # The type of this column, "label" or "annotation". + type: label + # The key of the label or annotation, e.g., "workflows.argoproj.io/completed". + key: workflows.argoproj.io/completed diff --git a/components/argo/include-links b/components/argo/include-links new file mode 100644 index 00000000..1f78bbb6 --- /dev/null +++ b/components/argo/include-links @@ -0,0 +1,25 @@ +# Adds a button to the workflow page. E.g. linking to you logging facility. +- name: Example Workflow Link + scope: workflow + url: http://logging-facility?namespace=${metadata.namespace}&workflowName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} +# Adds a button next to the pod. E.g. linking to you logging facility but for the pod only. +- name: Example Pod Link + scope: pod + url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} +- name: Pod Logs + scope: pod-logs + url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} +- name: Event Source Logs + scope: event-source-logs + url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} +- name: Sensor Logs + scope: sensor-logs + url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} +# Adds a button to the bottom right of every page to link to your organisation help or chat. +- name: Get help + scope: chat + url: http://my-chat +# Adds a button to the top of workflow view to navigate to customized views. +- name: Completed Workflows + scope: workflow-list + url: http://workflows?label=workflows.argoproj.io/completed=true diff --git a/components/argo/kustomization.yaml b/components/argo/kustomization.yaml index 31371a9a..bfaf2991 100644 --- a/components/argo/kustomization.yaml +++ b/components/argo/kustomization.yaml @@ -66,3 +66,5 @@ configMapGenerator: files: - sso - workflowDefaults=workflow-defaults + - links=include-links + - columns=include-columns From cac82799fa9eeaccaee9f8a2fb80619850ccf7a3 Mon Sep 17 00:00:00 2001 From: nicholaskuechler Date: Fri, 16 Aug 2024 12:48:58 -0500 Subject: [PATCH 2/5] updaates --- components/argo/kustomization.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/argo/kustomization.yaml b/components/argo/kustomization.yaml index bfaf2991..eeb4e1af 100644 --- a/components/argo/kustomization.yaml +++ b/components/argo/kustomization.yaml @@ -66,5 +66,8 @@ configMapGenerator: files: - sso - workflowDefaults=workflow-defaults + - name: workflow-controller-configmap + behavior: replace + files: - links=include-links - columns=include-columns From a05afbb9c3e48e356ed603f3c8be28d582203fb7 Mon Sep 17 00:00:00 2001 From: nicholaskuechler Date: Fri, 16 Aug 2024 12:52:07 -0500 Subject: [PATCH 3/5] updaates --- components/argo/include-columns | 6 +----- components/argo/include-links | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/components/argo/include-columns b/components/argo/include-columns index 4fe17796..26eeccdc 100644 --- a/components/argo/include-columns +++ b/components/argo/include-columns @@ -1,7 +1,3 @@ -# Adds a column to the Workflow List View -- # The name of this column, e.g., "Workflow Completed". - name: Workflow Completed - # The type of this column, "label" or "annotation". +- name: Workflow Completed type: label - # The key of the label or annotation, e.g., "workflows.argoproj.io/completed". key: workflows.argoproj.io/completed diff --git a/components/argo/include-links b/components/argo/include-links index 1f78bbb6..473b8050 100644 --- a/components/argo/include-links +++ b/components/argo/include-links @@ -1,8 +1,6 @@ -# Adds a button to the workflow page. E.g. linking to you logging facility. - name: Example Workflow Link scope: workflow url: http://logging-facility?namespace=${metadata.namespace}&workflowName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} -# Adds a button next to the pod. E.g. linking to you logging facility but for the pod only. - name: Example Pod Link scope: pod url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} @@ -15,11 +13,9 @@ - name: Sensor Logs scope: sensor-logs url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} -# Adds a button to the bottom right of every page to link to your organisation help or chat. - name: Get help scope: chat url: http://my-chat -# Adds a button to the top of workflow view to navigate to customized views. - name: Completed Workflows scope: workflow-list url: http://workflows?label=workflows.argoproj.io/completed=true From be2ae4ce7b166605684c26c329e0e3a41934e112 Mon Sep 17 00:00:00 2001 From: nicholaskuechler Date: Fri, 16 Aug 2024 13:12:51 -0500 Subject: [PATCH 4/5] updates --- components/argo/include-links | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/argo/include-links b/components/argo/include-links index 473b8050..c497d61d 100644 --- a/components/argo/include-links +++ b/components/argo/include-links @@ -16,6 +16,6 @@ - name: Get help scope: chat url: http://my-chat -- name: Completed Workflows +- name: Failed Workflows scope: workflow-list - url: http://workflows?label=workflows.argoproj.io/completed=true + url: /workflows?namespace=argo-events&phase=Failed&phase=Error&limit=50 From 4a0ecd301c16e46e2b78eb904bdff1fc29e18fde Mon Sep 17 00:00:00 2001 From: nicholaskuechler Date: Fri, 16 Aug 2024 13:17:47 -0500 Subject: [PATCH 5/5] updates --- components/argo/include-links | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/argo/include-links b/components/argo/include-links index c497d61d..702be565 100644 --- a/components/argo/include-links +++ b/components/argo/include-links @@ -18,4 +18,4 @@ url: http://my-chat - name: Failed Workflows scope: workflow-list - url: /workflows?namespace=argo-events&phase=Failed&phase=Error&limit=50 + url: https://workflows.uc.ohthree.com/workflows?namespace=argo-events&phase=Failed&phase=Error&limit=50