From eb62f384704453389d96d5758563b65289515291 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Sun, 31 Mar 2024 16:32:02 +0200 Subject: [PATCH] chore: related issues: - #2558 - #2493 - #1391 - #2126 Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_helpers.tpl | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index ab3f6a3636..7127c28b43 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.7 +version: 7.3.8 appVersion: 10.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 790d5a293a..570b92742c 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress. Return the appropriate apiVersion for Horizontal Pod Autoscaler. */}} {{- define "grafana.hpa.apiVersion" -}} -{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2" }} -{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2beta2" }} -{{- else }} -{{- print "autoscaling/v2beta1" }} -{{- end }} + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + {{- "autoscaling/v2" }} + {{- else }} + {{- "autoscaling/v2beta2" }} + {{- end }} {{- end }} {{/*