From f01ddee8469dc0e872aaeef35d8f4a4bf720fcae Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Thu, 26 Sep 2024 15:05:27 +0200 Subject: [PATCH] chore(common): formatting --- charts/common/templates/_helm.tpl | 34 ++++++++++++++------------ charts/common/templates/_telemetry.tpl | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/charts/common/templates/_helm.tpl b/charts/common/templates/_helm.tpl index 7cb6da5bac..d699cdb75e 100644 --- a/charts/common/templates/_helm.tpl +++ b/charts/common/templates/_helm.tpl @@ -24,24 +24,28 @@ Returns a HelmRelease.spec.chart.spec for a given chart in a given repository. {{- $spec := dict -}} {{- if eq (dig .repo "type" "helm" .Values.global.helmRepositories) "helm" -}} {{- $spec = mustMerge (dict - "chart" .chart - "sourceRef" (dict - "kind" "HelmRepository" - "name" (eq .prependReleaseName true | ternary (printf "%s-%s" .Release.Name .repo) .repo) - "namespace" .Release.Namespace) - "version" (include "common.helm.chartVersion" (dict "repo" .repo "chart" .chart "context" .context)) - ) $spec + "chart" .chart + "sourceRef" (dict + "kind" "HelmRepository" + "name" (eq .prependReleaseName true | ternary (printf "%s-%s" .Release.Name .repo) .repo) + "namespace" .Release.Namespace + ) + "version" (include "common.helm.chartVersion" (dict "repo" .repo "chart" .chart "context" .context)) + ) + $spec -}} {{- else -}} {{- $spec = mustMerge (dict - "chart" (dig .repo "charts" .chart "path" (printf "charts/%s" .chart) .Values.global.helmRepositories) - "sourceRef" (dict - "kind" "GitRepository" - "name" (eq .prependReleaseName true | ternary (printf "%s-%s-%s" .Release.Name .repo .chart) (printf "%s-%s" .repo .chart)) - "namespace" .Release.Namespace) - "reconcileStrategy" (.reconcileStrategy | default "Revision") - ) $spec + "chart" (dig .repo "charts" .chart "path" (printf "charts/%s" .chart) .Values.global.helmRepositories) + "sourceRef" (dict + "kind" "GitRepository" + "name" (eq .prependReleaseName true | ternary (printf "%s-%s-%s" .Release.Name .repo .chart) (printf "%s-%s" .repo .chart)) + "namespace" .Release.Namespace + ) + "reconcileStrategy" (.reconcileStrategy | default "Revision") + ) + $spec -}} {{- end -}} - {{- $spec | toYaml -}} + {{- toYaml $spec -}} {{- end -}} diff --git a/charts/common/templates/_telemetry.tpl b/charts/common/templates/_telemetry.tpl index fcdd247974..790f42efe1 100644 --- a/charts/common/templates/_telemetry.tpl +++ b/charts/common/templates/_telemetry.tpl @@ -64,6 +64,6 @@ {{- range $key, $value := $env -}} {{- $podEnv = append $podEnv (dict "name" $key "value" ($value | toString)) -}} {{- end -}} - {{- $podEnv | toYaml -}} + {{- toYaml $podEnv -}} {{- end -}} {{- end -}}