diff --git a/charts/library/common-test/Chart.yaml b/charts/library/common-test/Chart.yaml index 195b2cc4970..5ffe691cc0a 100644 --- a/charts/library/common-test/Chart.yaml +++ b/charts/library/common-test/Chart.yaml @@ -7,7 +7,7 @@ apiVersion: v2 appVersion: unknown dependencies: - name: common - version: ~26.1.0 + version: ~26.2.0 repository: file://../common/ condition: "" alias: "" diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 42fe1986c25..fd0425e3eb6 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -48,4 +48,4 @@ sources: - https://hub.docker.com/_/ - https://hub.docker.com/r/mikefarah/yq type: library -version: 26.1.0 +version: 26.2.0 diff --git a/charts/library/common/templates/values/_init.tpl b/charts/library/common/templates/values/_init.tpl index 154742d8cba..0ae6a642574 100644 --- a/charts/library/common/templates/values/_init.tpl +++ b/charts/library/common/templates/values/_init.tpl @@ -9,6 +9,18 @@ {{- $commonValues := mustDeepCopy .Values.common -}} {{- $chartValues := mustDeepCopy (omit .Values "common") -}} {{- $mergedValues := mustMergeOverwrite $commonValues $chartValues -}} + {{- range $name, $dependencyValues := .Values.dependencies -}} + {{ $enabled := (include "tc.v1.common.lib.util.enabled" (dict + "rootCtx" $ "objectData" $dependencyValues + "name" $name "caller" "dependency" + "key" "dependencies")) }} + {{- if eq $enabled "true" -}} + {{- $dependencyValues := omit $dependencyValues "global " -}} + {{- $dependencyValues := omit $dependencyValues "securityContext " -}} + {{- $dependencyValues := omit $dependencyValues "podOptions " -}} + {{- $mergedValues = mustMergeOverwrite $mergedValues $dependencyValues -}} + {{- end -}} + {{- end -}} {{- $_ := set . "Values" (mustDeepCopy $mergedValues) -}} {{- end -}} {{- end -}}