From fcb2b0a16a7692ee0a705ce239375843a63246c7 Mon Sep 17 00:00:00 2001 From: Everton Seiei Arakaki Date: Fri, 19 Apr 2024 16:43:03 +0200 Subject: [PATCH] feat: add toleration for bloom components (#12653) Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> --- ADOPTERS.md | 1 + production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- .../bloom-compactor/statefulset-bloom-compactor.yaml | 4 ++++ .../templates/bloom-gateway/statefulset-bloom-gateway.yaml | 4 ++++ 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ADOPTERS.md b/ADOPTERS.md index de6440bc7e69..52621c48a34d 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -7,3 +7,4 @@ * [Heureka Group](https://heureka.group) * [Norwegian Refugee Council](https://www.nrc.no/) * [Dropbox](https://www.dropbox.com/) +* [ASML](https://www.asml.com/) \ No newline at end of file diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index ad796a850c3b..6e05fa4e4656 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) +## 6.2.5 + +- [BUGFIX] Add missing toleration blocks to bloom components. + ## 6.2.4 - [ENHANCEMENT] Activate the volume endpoint by default. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index e8b160550bc9..5a893a0b8212 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 3.0.0 -version: 6.2.4 +version: 6.2.5 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index c892d1b4f364..6b8f19504a4b 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.2.4](https://img.shields.io/badge/Version-6.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.2.5](https://img.shields.io/badge/Version-6.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/templates/bloom-compactor/statefulset-bloom-compactor.yaml b/production/helm/loki/templates/bloom-compactor/statefulset-bloom-compactor.yaml index fbece8f2953e..424fa4bb65d7 100644 --- a/production/helm/loki/templates/bloom-compactor/statefulset-bloom-compactor.yaml +++ b/production/helm/loki/templates/bloom-compactor/statefulset-bloom-compactor.yaml @@ -131,6 +131,10 @@ spec: nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.bloomCompactor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} volumes: - name: temp emptyDir: {} diff --git a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml index 353b0203fe79..e2ceefbeafb5 100644 --- a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml +++ b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml @@ -131,6 +131,10 @@ spec: nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.bloomGateway.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} volumes: - name: temp emptyDir: {}