From f3e89c0070760459487c93a4e88f608974a6e920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20OLIVIER?= <cedric3.olivier@orange.com>
Date: Wed, 7 Jul 2021 08:28:41 +0000
Subject: [PATCH] fix: conflict between vault and scoped vars

---
 templates/gitlab-ci-helm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-helm.yml b/templates/gitlab-ci-helm.yml
index 80fe208..a49ddff 100644
--- a/templates/gitlab-ci-helm.yml
+++ b/templates/gitlab-ci-helm.yml
@@ -278,7 +278,7 @@ stages:
   }
 
   function eval_all_secrets() {
-    encoded_vars=$(env | grep -v '^scoped__' | awk -F '=' '/^[a-zA-Z0-9_]*=@(b64|hex|url)@/ {print $1}')
+    encoded_vars=$(env | grep -Ev '(^|.*_ENV_)scoped__' | awk -F '=' '/^[a-zA-Z0-9_]*=@(b64|hex|url)@/ {print $1}')
     for var in $encoded_vars
     do
       eval_secret "$var"
-- 
GitLab