[bitnami/dremio] Engine overrides are clobbered by the last value (#34725)

* [bitnami/dremio] Engine overrides are clobbered by the last value

Signed-off-by: Daniel Jimenez <daniel.j.jimenez@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

---------

Signed-off-by: Daniel Jimenez <daniel.j.jimenez@gmail.com>
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
Co-authored-by: Bitnami Bot <bitnami.bot@broadcom.com>

bitnami/dremio/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## 3.0.4 (2025-06-13)
+## 3.0.5 (2025-07-03)
 
-* [bitnami/dremio] bugfix: common.capabilities.vpa.apiVersion context ([#34380](https://github.com/bitnami/charts/pull/34380))
+* [bitnami/dremio] Engine overrides are clobbered by the last value ([#34725](https://github.com/bitnami/charts/pull/34725))
+
+## <small>3.0.4 (2025-06-13)</small>
+
+* [bitnami/dremio] bugfix: common.capabilities.vpa.apiVersion context (#34380) ([f2eeff4](https://github.com/bitnami/charts/commit/f2eeff497d27abdfa56952953a3d8069e84f247d)), closes [#34380](https://github.com/bitnami/charts/issues/34380)
 
 ## <small>3.0.3 (2025-06-10)</small>
 

bitnami/dremio/Chart.yaml

@@ -43,4 +43,4 @@ sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/dremio
 - https://github.com/bitnami/containers/tree/main/bitnami/dremio
 - https://github.com/dremio/dremio-oss
-version: 3.0.4
+version: 3.0.5

bitnami/dremio/templates/executor/configmap-dremio-conf.yaml

@@ -23,7 +23,8 @@ services.executor.enabled: true
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- if not $executorValues.dremioConf.existingConfigmap }}
 ---
 apiVersion: v1

bitnami/dremio/templates/executor/hpa.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- if $executorValues.autoscaling.hpa.enabled }}
 ---
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" (dict "context" $) }}

bitnami/dremio/templates/executor/networkpolicy.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- if $executorValues.networkPolicy.enabled }}
 ---
 kind: NetworkPolicy

bitnami/dremio/templates/executor/pdb.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- if $executorValues.pdb.create }}
 ---
 apiVersion: {{ include "common.capabilities.policy.apiVersion" $ }}

bitnami/dremio/templates/executor/secret-dremio-conf.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- $extraFiles := mustMergeOverwrite $.Values.dremio.dremioConf.extraSecretFiles $executorValues.dremioConf.extraSecretFiles }}
 {{- $createDremioConf := or $.Values.dremio.dremioConf.secretConfigOverrides $executorValues.dremioConf.secretConfigOverrides $.Values.dremio.tls.enabled }}
 {{- if and (not $executorValues.dremioConf.existingSecret) (or $createDremioConf $extraFiles) }}

bitnami/dremio/templates/executor/service-account.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 {{- if $executorValues.serviceAccount.create }}
 ---
 apiVersion: v1

bitnami/dremio/templates/executor/statefulset.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 ---
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" $ }}
 kind: StatefulSet

bitnami/dremio/templates/executor/vpa.yaml

@@ -12,7 +12,8 @@ SPDX-License-Identifier: APACHE-2.0
   https://docs.dremio.com/cloud/sonar/workloads/engines/
  */}}
 {{- range $engine := .Values.executor.engines }}
-{{- $executorValues := mustMergeOverwrite $.Values.executor.common $engine.overrides }}
+{{- $executorValues := deepCopy $.Values.executor.common }}
+{{- $executorValues = mustMergeOverwrite $executorValues $engine.overrides }}
 
 {{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" $ )) $executorValues.autoscaling.vpa.enabled }}
 ---