From b76a3f3f42ad23a435cd26a53589666a68d657dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=81=94?= <594647004@qq.com> Date: Wed, 28 Apr 2021 14:48:25 +0800 Subject: [PATCH] Check whether parameter.cmd is nill for sidecar trait (#1575) --- charts/vela-core/templates/defwithtemplate/sidecar.yaml | 8 +++++--- hack/vela-templates/cue/sidecar.cue | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/charts/vela-core/templates/defwithtemplate/sidecar.yaml b/charts/vela-core/templates/defwithtemplate/sidecar.yaml index e836a868f..04042e214 100644 --- a/charts/vela-core/templates/defwithtemplate/sidecar.yaml +++ b/charts/vela-core/templates/defwithtemplate/sidecar.yaml @@ -16,9 +16,11 @@ spec: patch: { // +patchKey=name spec: template: spec: containers: [{ - name: parameter.name - image: parameter.image - command: parameter.cmd + name: parameter.name + image: parameter.image + if parameter.cmd != _|_ { + command: parameter.cmd + } if parameter["volumes"] != _|_ { volumeMounts: [ for v in parameter.volumes { { diff --git a/hack/vela-templates/cue/sidecar.cue b/hack/vela-templates/cue/sidecar.cue index 209339495..1661430e5 100644 --- a/hack/vela-templates/cue/sidecar.cue +++ b/hack/vela-templates/cue/sidecar.cue @@ -1,9 +1,11 @@ patch: { // +patchKey=name spec: template: spec: containers: [{ - name: parameter.name - image: parameter.image - command: parameter.cmd + name: parameter.name + image: parameter.image + if parameter.cmd != _|_ { + command: parameter.cmd + } if parameter["volumes"] != _|_ { volumeMounts: [ for v in parameter.volumes { {