Template config name

Author: morazow

helm/templates/_security.tpl

@@ -122,27 +122,10 @@ client.security.sasl.mechanism: {{ upper $internalMechanism }}
 {{- end -}}
 
 {{/*
-Returns SASL volume mount entries for StatefulSet containers.
+Returns the SASL JAAS config name.
 Usage:
-  include "fluss.security.sasl.volumeMountPath" . | nindent 12
+  include "fluss.security.sasl.configName" .
 */}}
-{{- define "fluss.security.sasl.volumeMountPath" -}}
-{{- if (include "fluss.security.sasl.plain.enabled" .) }}
-- name: sasl-config
-  mountPath: /etc/fluss/conf
-  readOnly: true
-{{- end }}
-{{- end -}}
-
-{{/*
-Returns SASL volume entries for StatefulSet pod spec.
-Usage:
-  include "fluss.security.sasl.volumeMountName" . | nindent 8
-*/}}
-{{- define "fluss.security.sasl.volumeMountName" -}}
-{{- if (include "fluss.security.sasl.plain.enabled" .) }}
-- name: sasl-config
-  secret:
-    secretName: {{ include "fluss.fullname" . }}-sasl-jaas-config
-{{- end }}
+{{- define "fluss.security.sasl.configName" -}}
+{{ include "fluss.fullname" . }}-sasl-jaas-config
 {{- end -}}

helm/templates/secret-jaas-config.yaml

@@ -21,7 +21,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "fluss.fullname" . }}-sasl-jaas-config
+  name: {{ include "fluss.security.sasl.configName" . }}
   labels:
     {{- include "fluss.labels" . | nindent 4 }}
 type: Opaque

helm/templates/sts-coordinator.yaml

@@ -105,7 +105,11 @@ spec:
               mountPath: /opt/conf
             - name: data
               mountPath: /tmp/fluss/data
-            {{- include "fluss.security.sasl.volumeMountPath" . | nindent 12 }}
+            {{- if (include "fluss.security.sasl.plain.enabled" .) }}
+            - name: sasl-config
+              mountPath: /etc/fluss/conf
+              readOnly: true
+            {{- end }}
       volumes:
         - name: fluss-conf
           configMap:
@@ -114,7 +118,11 @@ spec:
         - name: data
           emptyDir: {}
         {{- end }}
-        {{- include "fluss.security.sasl.volumeMountName" . | nindent 8 }}
+        {{- if (include "fluss.security.sasl.plain.enabled" .) }}
+        - name: sasl-config
+          secret:
+            secretName: {{ include "fluss.security.sasl.configName" . }}
+        {{- end }}
   {{- if .Values.coordinator.storage.enabled }}
   volumeClaimTemplates:
     - metadata:

helm/templates/sts-tablet.yaml

@@ -102,7 +102,11 @@ spec:
               mountPath: /opt/conf
             - name: data
               mountPath: /tmp/fluss/data
-            {{- include "fluss.security.sasl.volumeMountPath" . | nindent 12 }}
+            {{- if (include "fluss.security.sasl.plain.enabled" .) }}
+            - name: sasl-config
+              mountPath: /etc/fluss/conf
+              readOnly: true
+            {{- end }}
       volumes:
         - name: fluss-conf
           configMap:
@@ -111,7 +115,11 @@ spec:
         - name: data
           emptyDir: {}
         {{- end }}
-        {{- include "fluss.security.sasl.volumeMountName" . | nindent 8 }}
+        {{- if (include "fluss.security.sasl.plain.enabled" .) }}
+        - name: sasl-config
+          secret:
+            secretName: {{ include "fluss.security.sasl.configName" . }}
+        {{- end }}
   {{- if .Values.tablet.storage.enabled }}
   volumeClaimTemplates:
     - metadata: