From eb62f384704453389d96d5758563b65289515291 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Sun, 31 Mar 2024 16:32:02 +0200 Subject: [PATCH 1/4] 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 }} {{/* From 32ac08b9dd50f16d0a544f754f739089bac398fc Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Tue, 9 Apr 2024 08:33:06 -0300 Subject: [PATCH 2/4] include review suggested by @zanhsieh Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 570b92742c..f3ebc37c93 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -145,11 +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" }} - {{- "autoscaling/v2" }} - {{- else }} - {{- "autoscaling/v2beta2" }} - {{- end }} +{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} +{{- print "autoscaling/v2" }} +{{- else }} +{{- print "autoscaling/v2beta2" }} +{{- end }} {{- end }} {{/* From 3acbc5d03830bf750808d58966f9a38656fcb978 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Fri, 19 Apr 2024 10:30:46 -0300 Subject: [PATCH 3/4] bumb chart version Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index efd3bd081c..167bdf17a8 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.9 +version: 7.3.8 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 6db205c65da69139b3740a215394f8c98e1b4eb5 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Fri, 19 Apr 2024 10:31:29 -0300 Subject: [PATCH 4/4] fix: chart bumb Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 167bdf17a8..3e9fcac6f2 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.8 +version: 7.3.10 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics.