[helm][hotfix] Go template whitespace trimming caused exceptions

[morazow]

Purpose

Linked issue: close NA

In secret-jaas-config.yaml, the variable assignments between the license comment block and apiVersion use Go templating whitespace trimming ({{- ... -}}) approach.

Since assignments produce no output, they consume all surrounding whitespaces, including the newline after the last # comment line. This glues # and apiVersion: v1 into #apiVersion: v1, which YAML parses as a comment.

The resulting document has no apiVersion field, causing Helm to reject it with "apiVersion not set."

The same issue also affects serviceaccount.yaml, where the license block sits outside the {{- if .Values.serviceAccount.create }} guard, producing a comment-only YAML document when disabled.

Brief change log

Move the variable assignments before the license block so the comment to apiVersion gap is no longer merged by trimming directives.

Tests

Existing tests pass

API and Format

NA

Documentation

NA

[affo]

@morazow instead of putting that before the licensing, can't we remove some - to avoid eating spaces?

[morazow]

Hello @affo,

Yes, it works, I tested it yesterday.

E.g, make template, generates something as below:

---
# Source: fluss-dev/charts/fluss-bundle/charts/fluss/templates/secret-jaas-config.yaml
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# Source: fluss-dev/charts/fluss-bundle/charts/fluss/templates/serviceaccount.yaml
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

But my idea was, if they are not enabled, don't also add these lines.

So both ways possible. Which should we use?

[affo]

@morazow I think legally the first thing at the top of the file should be the license

[morazow]

Yeah, they are still in the file, but skipped if we don't render them.

I updated it so they are rendered 🤝