github-personal/cozystack
1
0
Fork 0
mirror of https://github.com/outbackdingo/cozystack.git synced 2026-01-27 18:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[kubernetes] Fix merging valuesOverride for tenant clusters (#879)

Browse Source
This commit is contained in:
Andrei Kvapil
2025-04-24 14:24:53 +02:00
committed by GitHub
parent 70d3591ed2 1ccd3074dc
commit 13d7df47d7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
View File

@@ -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 }}

2
packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml
View File

@@ -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 }}