From 1ccd3074dcf89f9b328044d3abbcc9c416d06674 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 24 Apr 2025 14:24:07 +0200 Subject: [PATCH] [kubernetes] Fix merging valuesOverride for tenant clusters Signed-off-by: Andrei Kvapil --- .../apps/kubernetes/templates/helmreleases/ingress-nginx.yaml | 2 +- .../templates/helmreleases/vertical-pod-autoscaler.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml index c312c217..1bcbf422 100644 --- a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml @@ -43,7 +43,7 @@ spec: remediation: retries: -1 values: - {{- toYaml (merge (fromYaml (include "cozystack.defaultIngressValues" .)) .Values.addons.ingressNginx.valuesOverride) | nindent 4 }} + {{- toYaml (deepCopy .Values.addons.ingressNginx.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultIngressValues" .))) | nindent 4 }} dependsOn: {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - name: {{ .Release.Name }} diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml index 988cc7f2..af83f4f3 100644 --- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml @@ -56,7 +56,7 @@ spec: remediation: retries: -1 values: - {{- toYaml (merge (fromYaml (include "cozystack.defaultVPAValues" .)) .Values.addons.verticalPodAutoscaler.valuesOverride) | nindent 4 }} + {{- toYaml (deepCopy .Values.addons.verticalPodAutoscaler.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultVPAValues" .))) | nindent 4 }} dependsOn: {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - name: {{ .Release.Name }}