From 48d49e47417ca9aec1e3bf71435259476ff5cd33 Mon Sep 17 00:00:00 2001 From: "jing.zhao" Date: Mon, 27 Jul 2020 11:47:00 +0800 Subject: [PATCH 1/2] [CLOUD-1126] Add kraken argo executor env to collect eci pod's logs --- charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 43699820..8a5b5cd3 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -8,6 +8,9 @@ metadata: heritage: {{ .Release.Service }} data: config: | + {{- if .Values.controller.executor.enabled }} + executor: +{{ toYaml .Values.controller.executor | indent 6}}{{- end -}} {{- if .Values.controller.instanceID.enabled }} {{- if .Values.controller.instanceID.useReleaseName }} instanceID: {{ .Release.Name }} From 7cc96494ce04831b445dec946730c61a1215a50d Mon Sep 17 00:00:00 2001 From: "jing.zhao" Date: Wed, 29 Jul 2020 10:07:42 +0800 Subject: [PATCH 2/2] change a new way to add configmap --- .../argo/templates/workflow-controller-config-map.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 8a5b5cd3..79d4aff4 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -8,9 +8,6 @@ metadata: heritage: {{ .Release.Service }} data: config: | - {{- if .Values.controller.executor.enabled }} - executor: -{{ toYaml .Values.controller.executor | indent 6}}{{- end -}} {{- if .Values.controller.instanceID.enabled }} {{- if .Values.controller.instanceID.useReleaseName }} instanceID: {{ .Release.Name }} @@ -19,6 +16,12 @@ data: {{- end }} {{- end }} containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }} + {{- if .Values.executor.env }} + executor: + {{- with .Values.executor.env }} + env: {{- toYaml . | nindent 6 }} + {{- end }} + {{- end }} artifactRepository: {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }} {{- if .Values.artifactRepository.archiveLogs }}