From 16d8a4ee73705ee6db2191d84e03a2ba3ea95deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?= Date: Fri, 20 May 2022 17:23:14 +0200 Subject: [PATCH] Differentiate between autoscaling v1beta1 and v1beta2 (#10331) Signed-off-by: Miguel A. Cabrera Minagorri --- bitnami/common/Chart.yaml | 2 +- bitnami/common/templates/_capabilities.tpl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml index 2158eee1a..722b70f93 100644 --- a/bitnami/common/Chart.yaml +++ b/bitnami/common/Chart.yaml @@ -20,4 +20,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 1.14.0 +version: 1.14.1 diff --git a/bitnami/common/templates/_capabilities.tpl b/bitnami/common/templates/_capabilities.tpl index 11510487e..9d9b76004 100644 --- a/bitnami/common/templates/_capabilities.tpl +++ b/bitnami/common/templates/_capabilities.tpl @@ -130,9 +130,13 @@ Return the appropriate apiVersion for APIService. Return the appropriate apiVersion for Horizontal Pod Autoscaler. */}} {{- define "common.capabilities.hpa.apiVersion" -}} -{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) -}} +{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .context) -}} +{{- if .beta2 -}} {{- print "autoscaling/v2beta2" -}} {{- else -}} +{{- print "autoscaling/v2beta1" -}} +{{- end -}} +{{- else -}} {{- print "autoscaling/v2" -}} {{- end -}} {{- end -}}