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

[tempo-distributed] fix hpa selector #3051

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+7 −7
Open

[tempo-distributed] fix hpa selector #3051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f460d96
fix tempo-distributed hpa selector
gritzkoo Mar 31, 2024
7774313
Merge branch 'main' into hotfix/solve-tempo-hpa-selector
zanhsieh May 1, 2024
2dc80d3
Update README.md
zanhsieh May 1, 2024
019dad3
update with main
gritzkoo May 13, 2024
85632a9
update docs
gritzkoo May 13, 2024
279ae8f
include print to statement
gritzkoo May 13, 2024
dfcb9af
Merge branch 'main' into hotfix/solve-tempo-hpa-selector
zanhsieh May 16, 2024
983295d
resolving conflicts
gritzkoo Jun 3, 2024
2540d34
revert miss typo
gritzkoo Jun 3, 2024
65054f0
update docs
gritzkoo Jun 3, 2024
b6fa5df
Merge branch 'main' into hotfix/solve-tempo-hpa-selector
zanhsieh Jun 5, 2024
d85317c
Merge branch 'main' into hotfix/solve-tempo-hpa-selector
zanhsieh Jun 8, 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/tempo-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.11.0
version: 1.11.1
appVersion: 2.5.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
2 changes: 1 addition & 1 deletion charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
![Version: 1.11.1](https://img.shields.io/badge/Version-1.11.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down
10 changes: 5 additions & 5 deletions charts/tempo-distributed/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,11 @@ Return the appropriate apiVersion for PodDisruptionBudget.
Return the appropriate apiVersion for HorizontalPodAutoscaler.
*/}}
{{- define "tempo.hpa.apiVersion" -}}
{{- if and (.Capabilities.APIVersions.Has "autoscaling/v2") (semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version) -}}
{{- print "autoscaling/v2" -}}
{{- else -}}
{{- print "autoscaling/v2beta1" -}}
{{- end -}}
{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
{{- print "autoscaling/v2" }}
{{- else }}
{{- print "autoscaling/v2beta2" }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to track v2beta1 also?

{{- end }}
{{- end -}}

{{/*
Expand Down
Loading