From f95dec803bd138b76d67a296545974c5a644d63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kazimieras=20=C4=8Cernauskis?= Date: Fri, 25 Nov 2022 12:01:06 +0200 Subject: [PATCH] [bitnami/common] fix common topology key affinity function (#13593) * fix common topology key affinity function Signed-off-by: Kazimieras * remove indent and trim Signed-off-by: Kazimieras * fix function description Signed-off-by: Kazimieras Signed-off-by: Kazimieras --- bitnami/common/Chart.yaml | 4 ++-- bitnami/common/templates/_affinities.tpl | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml index 5522a6801..28e278a8f 100644 --- a/bitnami/common/Chart.yaml +++ b/bitnami/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure apiVersion: v2 # Please make sure that version and appVersion are always the same. -appVersion: 2.2.0 +appVersion: 2.2.1 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself. home: https://github.com/bitnami/charts/tree/main/bitnami/common icon: https://bitnami.com/downloads/logos/bitnami-mark.png @@ -20,4 +20,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 2.2.0 +version: 2.2.1 diff --git a/bitnami/common/templates/_affinities.tpl b/bitnami/common/templates/_affinities.tpl index a1c2dcd27..81902a681 100644 --- a/bitnami/common/templates/_affinities.tpl +++ b/bitnami/common/templates/_affinities.tpl @@ -50,8 +50,7 @@ Return a topologyKey definition {{ include "common.affinities.topologyKey" (dict "topologyKey" "BAR") -}} */}} {{- define "common.affinities.topologyKey" -}} -{{- $topologyKey := default "kubernetes.io/hostname" .topologyKey -}} -{{- $topologyKey | indent 1 -}} +{{ .topologyKey | default "kubernetes.io/hostname" -}} {{- end -}} {{/* @@ -71,7 +70,7 @@ preferredDuringSchedulingIgnoredDuringExecution: {{- range $key, $value := $extraMatchLabels }} {{ $key }}: {{ $value | quote }} {{- end }} - topologyKey:{{ include "common.affinities.topologyKey" .topologyKey }} + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} weight: 1 {{- end -}} @@ -91,7 +90,7 @@ requiredDuringSchedulingIgnoredDuringExecution: {{- range $key, $value := $extraMatchLabels }} {{ $key }}: {{ $value | quote }} {{- end }} - topologyKey:{{ include "common.affinities.topologyKey" .topologyKey }} + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} {{- end -}} {{/*