From ac9e19b46daef26b1b10e360836558e3f52eecb4 Mon Sep 17 00:00:00 2001 From: morazow Date: Tue, 17 Mar 2026 16:29:11 +0100 Subject: [PATCH 1/2] [helm][hotfix] Go template whitespace trimming caused exceptions --- helm/templates/secret-jaas-config.yaml | 10 +++++----- helm/templates/serviceaccount.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/templates/secret-jaas-config.yaml b/helm/templates/secret-jaas-config.yaml index 767ec8f058..cfb468c007 100644 --- a/helm/templates/secret-jaas-config.yaml +++ b/helm/templates/secret-jaas-config.yaml @@ -1,3 +1,8 @@ +{{- if (include "fluss.security.sasl.plain.enabled" .) }} +{{- $internalMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "internal") -}} +{{- $clientMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "client") -}} +{{- $internalUsername := include "fluss.security.sasl.plain.internal.username" . -}} +{{- $internalPassword := include "fluss.security.sasl.plain.internal.password" . -}} # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -16,11 +21,6 @@ # limitations under the License. # -{{- if (include "fluss.security.sasl.plain.enabled" .) -}} -{{- $internalMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "internal") -}} -{{- $clientMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "client") -}} -{{- $internalUsername := include "fluss.security.sasl.plain.internal.username" . -}} -{{- $internalPassword := include "fluss.security.sasl.plain.internal.password" . -}} apiVersion: v1 kind: Secret metadata: diff --git a/helm/templates/serviceaccount.yaml b/helm/templates/serviceaccount.yaml index 5faa6022a1..2be718a0c2 100644 --- a/helm/templates/serviceaccount.yaml +++ b/helm/templates/serviceaccount.yaml @@ -1,3 +1,4 @@ +{{- if .Values.serviceAccount.create }} # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -16,7 +17,6 @@ # limitations under the License. # -{{- if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: From 936353567b47c54f221c89163d75775dde93bc19 Mon Sep 17 00:00:00 2001 From: morazow Date: Wed, 18 Mar 2026 11:28:06 +0100 Subject: [PATCH 2/2] Update and use without trimming --- helm/templates/secret-jaas-config.yaml | 10 +++++----- helm/templates/serviceaccount.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/templates/secret-jaas-config.yaml b/helm/templates/secret-jaas-config.yaml index cfb468c007..6ed411acbe 100644 --- a/helm/templates/secret-jaas-config.yaml +++ b/helm/templates/secret-jaas-config.yaml @@ -1,8 +1,3 @@ -{{- if (include "fluss.security.sasl.plain.enabled" .) }} -{{- $internalMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "internal") -}} -{{- $clientMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "client") -}} -{{- $internalUsername := include "fluss.security.sasl.plain.internal.username" . -}} -{{- $internalPassword := include "fluss.security.sasl.plain.internal.password" . -}} # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -21,6 +16,11 @@ # limitations under the License. # +{{ if (include "fluss.security.sasl.plain.enabled" .) }} +{{- $internalMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "internal") -}} +{{- $clientMechanism := include "fluss.security.listener.mechanism" (dict "context" .Values "listener" "client") -}} +{{- $internalUsername := include "fluss.security.sasl.plain.internal.username" . -}} +{{- $internalPassword := include "fluss.security.sasl.plain.internal.password" . -}} apiVersion: v1 kind: Secret metadata: diff --git a/helm/templates/serviceaccount.yaml b/helm/templates/serviceaccount.yaml index 2be718a0c2..4de1550eab 100644 --- a/helm/templates/serviceaccount.yaml +++ b/helm/templates/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.serviceAccount.create }} # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -17,6 +16,7 @@ # limitations under the License. # +{{ if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: