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

[loki-distributed] fix hpa selector #3052

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

[loki-distributed] fix hpa selector #3052

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
a00c1cd
fix hpa selector for loki-distributed
gritzkoo Mar 31, 2024
8f4d3fc
fix indent suggested by @zanhsieh
gritzkoo Apr 9, 2024
b96aea6
Merge branch 'main' into hotfix/solve-loki-distributed-hpa-selector
zanhsieh May 1, 2024
fdddb59
Update README.md
zanhsieh May 1, 2024
5b6339d
Update Chart.yaml
zanhsieh May 1, 2024
73dbfeb
Merge branch 'main' into hotfix/solve-loki-distributed-hpa-selector
zanhsieh May 11, 2024
2bc1d12
include print statement
gritzkoo May 13, 2024
a4c5c63
Merge branch 'main' into hotfix/solve-loki-distributed-hpa-selector
zanhsieh May 16, 2024
d95f1d9
Merge remote-tracking branch 'upstream/main' into hotfix/solve-loki-d…
gritzkoo Jun 3, 2024
1f39423
update chart version
gritzkoo Jun 3, 2024
4a23561
chore: update correctly chart version
gritzkoo Jun 3, 2024
b1a4b5a
Merge branch 'main' into hotfix/solve-loki-distributed-hpa-selector
zanhsieh Jun 5, 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/loki-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki-distributed
description: Helm chart for Grafana Loki in microservices mode
type: application
appVersion: 2.9.6
version: 0.79.0
version: 0.79.1
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion charts/loki-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki-distributed

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

Helm chart for Grafana Loki in microservices mode

Expand Down
10 changes: 5 additions & 5 deletions charts/loki-distributed/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ Return the appropriate apiVersion for PodDisruptionBudget.
Return the appropriate apiVersion for HorizontalPodAutoscaler.
*/}}
{{- define "loki.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 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we check for autoscaling/v2beta2 and autoscaling/v2beta1 and set those when supported also. I see autoscaling/v2beta1 is in 1.24, which doesn't seem that long ago, even if most of us are running newer versions.

{{- print "autoscaling/v2beta2" }}
{{- end }}
{{- end -}}

{{- define "loki.ingester.readinessProbe" -}}
Expand Down
Loading