From 24691ac42f3e7c6dda0d83e9dd62d8ee9e958593 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 16 Aug 2022 14:24:36 +0200 Subject: [PATCH] fix(manager/helmfile): replace all templates (#17210) --- lib/modules/manager/helmfile/__fixtures__/go-template.yaml | 1 + lib/modules/manager/helmfile/extract.spec.ts | 2 +- lib/modules/manager/helmfile/extract.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/modules/manager/helmfile/__fixtures__/go-template.yaml b/lib/modules/manager/helmfile/__fixtures__/go-template.yaml index b449daec393dc8..b1c332bcd8ed73 100644 --- a/lib/modules/manager/helmfile/__fixtures__/go-template.yaml +++ b/lib/modules/manager/helmfile/__fixtures__/go-template.yaml @@ -37,3 +37,4 @@ releases: - name: example-public version: 2.0.0 chart: stable/external-dns + namespace: "{{ env "NAMESPACE" }}" diff --git a/lib/modules/manager/helmfile/extract.spec.ts b/lib/modules/manager/helmfile/extract.spec.ts index e304e919d5bef7..f3f535df14bf66 100644 --- a/lib/modules/manager/helmfile/extract.spec.ts +++ b/lib/modules/manager/helmfile/extract.spec.ts @@ -335,7 +335,7 @@ describe('modules/manager/helmfile/extract', () => { datasource: 'helm', deps: [ { - depName: '{{ requiredEnv "RELEASE_NAME" }}', + depName: '', skipReason: 'local-chart', }, { depName: null, skipReason: 'local-chart' }, diff --git a/lib/modules/manager/helmfile/extract.ts b/lib/modules/manager/helmfile/extract.ts index d08512319966d2..ffb2538ba9f5b8 100644 --- a/lib/modules/manager/helmfile/extract.ts +++ b/lib/modules/manager/helmfile/extract.ts @@ -12,7 +12,7 @@ const isValidChartName = (name: string | undefined): boolean => function extractYaml(content: string): string { // regex remove go templated ({{ . }}) values - return content.replace(/(^|:)\s*{{.+}}\s*$/gm, '$1'); + return content.replace(regEx(/{{.+?}}/g), ''); } export function extractPackageFile(