From 0906a86ae5c23845c47448f66e6ac582880f7357 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 09:38:12 +0100 Subject: [PATCH 01/13] raw chart: fix regex to split objects in input templates --- charts/raw/templates/ressources.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index effc92c..8c0fd0e 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -5,7 +5,8 @@ {{- end }} {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} -{{- range regexSplit "---" $kubeResources -1 }} +{{/* Match "---" line separator without leading indentation and with potential trailing whitespaces or comment before the end of line */}} +{{- range regexSplit "(?m)^---(\\s*#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- {{ merge (. | fromYaml) $template | toYaml }} From da8ea3214f621aa3191d2b1fbc612769db11964d Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 09:54:50 +0100 Subject: [PATCH 02/13] Update chart version --- charts/raw/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index b720c33..a7cd804 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -8,7 +8,7 @@ keywords: maintainers: - name: Brawdunoir email: yann.lacroix@avisto.com -version: 1.0.1 +version: 1.0.2 kubeVersion: ">=1.16.0-0" annotations: artifacthub.io/signKey: | From 4b8571d0fa43d82e78fb93b08ab9d8a8519a96b3 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:06:27 +0100 Subject: [PATCH 03/13] Add artifactHub annotations for changelog --- charts/raw/Chart.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index a7cd804..f9e45bc 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -14,3 +14,6 @@ annotations: artifacthub.io/signKey: | fingerprint: AF455B903BFED8363C003F9A5E2474CA7617EC66 url: https://keybase.io/avistotelecom/pgp_keys.asc + artifacthub.io/changes: | + - kind: fixed + description: Fix regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates) From 7106c5c15e508a0e57197b281c391fd22b3cbaa5 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:07:57 +0100 Subject: [PATCH 04/13] Fix indentation --- charts/raw/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index f9e45bc..449f982 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -15,5 +15,5 @@ annotations: fingerprint: AF455B903BFED8363C003F9A5E2474CA7617EC66 url: https://keybase.io/avistotelecom/pgp_keys.asc artifacthub.io/changes: | - - kind: fixed - description: Fix regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates) + - kind: fixed + description: Fix regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates) From ea099f9d4beb103453990a33379384bf5c6d7c70 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:08:36 +0100 Subject: [PATCH 05/13] Change quotes --- charts/raw/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index 449f982..a845947 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -16,4 +16,4 @@ annotations: url: https://keybase.io/avistotelecom/pgp_keys.asc artifacthub.io/changes: | - kind: fixed - description: Fix regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates) + description: Fix regex to split objects in input templates: only the '---' line separator at the root level will be considered, excluding indented blocks with object parameters containing the '---' string as well (like TLS certificates) From b9dadde1d2017366a65e41eeb67237819a3419d6 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 17:43:25 +0100 Subject: [PATCH 06/13] Fix indentation allowed before --- --- charts/raw/templates/ressources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index 8c0fd0e..6892593 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -6,7 +6,7 @@ {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} {{/* Match "---" line separator without leading indentation and with potential trailing whitespaces or comment before the end of line */}} -{{- range regexSplit "(?m)^---(\\s*#.*)?$" $kubeResources -1 }} +{{- range regexSplit "(?m)^\\s*---(\\s*#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- {{ merge (. | fromYaml) $template | toYaml }} From 9e0684c9536a51c0032871e5b6d821e3d6af98df Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 17:45:02 +0100 Subject: [PATCH 07/13] update comment --- charts/raw/templates/ressources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index 6892593..5b794f7 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -5,7 +5,7 @@ {{- end }} {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} -{{/* Match "---" line separator without leading indentation and with potential trailing whitespaces or comment before the end of line */}} +{{/* Match "---" line separator without with potential leading and trailing whitespaces or comment before the end of line */}} {{- range regexSplit "(?m)^\\s*---(\\s*#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- From c7c1f132bbd1e95078c100e0f6d25652d860d2b2 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 17:50:30 +0100 Subject: [PATCH 08/13] Improve regex --- charts/raw/templates/ressources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index 5b794f7..29970a4 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -6,7 +6,7 @@ {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} {{/* Match "---" line separator without with potential leading and trailing whitespaces or comment before the end of line */}} -{{- range regexSplit "(?m)^\\s*---(\\s*#.*)?$" $kubeResources -1 }} +{{- range regexSplit "(?m)^\\s*---\\s*(#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- {{ merge (. | fromYaml) $template | toYaml }} From 441f2f4dccd17aa70c6a9e0246cdc87381242e78 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Wed, 25 Mar 2026 17:54:39 +0100 Subject: [PATCH 09/13] Update Chart.yaml --- charts/raw/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index a845947..bf81606 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -16,4 +16,4 @@ annotations: url: https://keybase.io/avistotelecom/pgp_keys.asc artifacthub.io/changes: | - kind: fixed - description: Fix regex to split objects in input templates: only the '---' line separator at the root level will be considered, excluding indented blocks with object parameters containing the '---' string as well (like TLS certificates) + description: Fix regex to split objects in input templates: only the "---" line separator will be considered, excluding object parameters containing the "---" string (like TLS certificates) From 2d3049a2b24b7e16e33716b698c3b98637c61641 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Thu, 26 Mar 2026 09:59:29 +0100 Subject: [PATCH 10/13] Put stronger regex for more accuracy --- charts/raw/templates/ressources.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index 29970a4..8c0fd0e 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -5,8 +5,8 @@ {{- end }} {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} -{{/* Match "---" line separator without with potential leading and trailing whitespaces or comment before the end of line */}} -{{- range regexSplit "(?m)^\\s*---\\s*(#.*)?$" $kubeResources -1 }} +{{/* Match "---" line separator without leading indentation and with potential trailing whitespaces or comment before the end of line */}} +{{- range regexSplit "(?m)^---(\\s*#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- {{ merge (. | fromYaml) $template | toYaml }} From 6794ece621c223571cab1b94f1f8ea44ceb923da Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Thu, 26 Mar 2026 10:01:01 +0100 Subject: [PATCH 11/13] Update to major version and adjust changelog --- charts/raw/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index bf81606..a0e2c6a 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -8,12 +8,12 @@ keywords: maintainers: - name: Brawdunoir email: yann.lacroix@avisto.com -version: 1.0.2 +version: 2.0.0 kubeVersion: ">=1.16.0-0" annotations: artifacthub.io/signKey: | fingerprint: AF455B903BFED8363C003F9A5E2474CA7617EC66 url: https://keybase.io/avistotelecom/pgp_keys.asc artifacthub.io/changes: | - - kind: fixed - description: Fix regex to split objects in input templates: only the "---" line separator will be considered, excluding object parameters containing the "---" string (like TLS certificates) + - kind: changed + description: Improve regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates). When upgrading to this 2.X.X version, be sure to verify that the templates passed in input only declare Kubernetes manifests aligned at the root level, without any leading indentation. From 7cf80918129d5e867e8cc0dfcaa4a4d5c725a9a1 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Thu, 2 Apr 2026 11:59:42 +0200 Subject: [PATCH 12/13] Fix error in regex --- charts/raw/templates/ressources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/raw/templates/ressources.yaml b/charts/raw/templates/ressources.yaml index 8c0fd0e..915f8c4 100644 --- a/charts/raw/templates/ressources.yaml +++ b/charts/raw/templates/ressources.yaml @@ -6,7 +6,7 @@ {{- range $i, $t := .Values.templates }} {{ $kubeResources := tpl $t $ }} {{/* Match "---" line separator without leading indentation and with potential trailing whitespaces or comment before the end of line */}} -{{- range regexSplit "(?m)^---(\\s*#.*)?$" $kubeResources -1 }} +{{- range regexSplit "(?m)^---\\s*(#.*)?$" $kubeResources -1 }} {{- if . | trim }} --- {{ merge (. | fromYaml) $template | toYaml }} From 976aae8a631bb9d2f934d1ade03ea115e29efd68 Mon Sep 17 00:00:00 2001 From: LeonoreM <55842339+LeonoreMangold@users.noreply.github.com> Date: Mon, 13 Apr 2026 14:56:31 +0200 Subject: [PATCH 13/13] Change to fix version --- charts/raw/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/raw/Chart.yaml b/charts/raw/Chart.yaml index a0e2c6a..2d7ecde 100644 --- a/charts/raw/Chart.yaml +++ b/charts/raw/Chart.yaml @@ -8,12 +8,12 @@ keywords: maintainers: - name: Brawdunoir email: yann.lacroix@avisto.com -version: 2.0.0 +version: 1.0.2 kubeVersion: ">=1.16.0-0" annotations: artifacthub.io/signKey: | fingerprint: AF455B903BFED8363C003F9A5E2474CA7617EC66 url: https://keybase.io/avistotelecom/pgp_keys.asc artifacthub.io/changes: | - - kind: changed - description: Improve regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates). When upgrading to this 2.X.X version, be sure to verify that the templates passed in input only declare Kubernetes manifests aligned at the root level, without any leading indentation. + - kind: fixed + description: Fix regex to split objects in input templates: only the "---" line separator at the root level will be considered, excluding indented blocks with object parameters containing the "---" string as well (like TLS certificates). When upgrading to this version, be sure to verify that the templates passed in input only declare Kubernetes manifests aligned at the root level, without any leading indentation.