Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[grafana] Fix HPA selector #3050

Merged
merged 10 commits into from
May 7, 2024
Merged

[grafana] Fix HPA selector #3050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb62f38
chore: related issues:
gritzkoo Mar 31, 2024
a5e1fe6
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
gritzkoo Apr 9, 2024
32ac08b
include review suggested by @zanhsieh
gritzkoo Apr 9, 2024
b6522ce
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
zanhsieh Apr 15, 2024
1d8f405
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
gritzkoo Apr 19, 2024
3acbc5d
bumb chart version
gritzkoo Apr 19, 2024
6db205c
fix: chart bumb
gritzkoo Apr 19, 2024
b44b121
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
zanhsieh Apr 25, 2024
e16f9bc
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
zanhsieh May 1, 2024
1004718
Merge branch 'main' into hotfix/solve-grafana-hpa-selector
zanhsieh May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/grafana/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: grafana
version: 7.3.9
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.
Expand Down
12 changes: 5 additions & 7 deletions charts/grafana/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
{{- print "autoscaling/v2" }}
{{- else }}
{{- print "autoscaling/v2beta2" }}
{{- end }}
{{- end }}

{{/*
Expand Down
Loading