From 2d5a16d45feb74fba2f6b167193b49d51619581e Mon Sep 17 00:00:00 2001 From: Somefive Date: Fri, 27 May 2022 20:39:18 +0800 Subject: [PATCH] Fix: env trait error when existing env exists Signed-off-by: Somefive --- charts/vela-core/templates/defwithtemplate/env.yaml | 3 ++- charts/vela-minimal/templates/defwithtemplate/env.yaml | 3 ++- vela-templates/definitions/internal/trait/env.cue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/vela-core/templates/defwithtemplate/env.yaml b/charts/vela-core/templates/defwithtemplate/env.yaml index d5b907ec6..8cba72f20 100644 --- a/charts/vela-core/templates/defwithtemplate/env.yaml +++ b/charts/vela-core/templates/defwithtemplate/env.yaml @@ -62,7 +62,8 @@ spec: } } }] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) { - v + name: k + value: v }] } } diff --git a/charts/vela-minimal/templates/defwithtemplate/env.yaml b/charts/vela-minimal/templates/defwithtemplate/env.yaml index d5b907ec6..8cba72f20 100644 --- a/charts/vela-minimal/templates/defwithtemplate/env.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/env.yaml @@ -62,7 +62,8 @@ spec: } } }] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) { - v + name: k + value: v }] } } diff --git a/vela-templates/definitions/internal/trait/env.cue b/vela-templates/definitions/internal/trait/env.cue index 19bf5bd16..69e93f590 100644 --- a/vela-templates/definitions/internal/trait/env.cue +++ b/vela-templates/definitions/internal/trait/env.cue @@ -55,7 +55,8 @@ template: { } } }] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) { - v + name: k + value: v }] } }