From 9d6c5c71218e617f93aca7accc67701423112991 Mon Sep 17 00:00:00 2001 From: Everton Seiei Arakaki Date: Wed, 17 Apr 2024 15:18:03 +0200 Subject: [PATCH 1/2] feat: add toleration for bloom components --- ADOPTERS.md | 1 + .../bloom-compactor/statefulset-bloom-compactor.yaml | 4 ++++ .../templates/bloom-gateway/statefulset-bloom-gateway.yaml | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/ADOPTERS.md b/ADOPTERS.md index de6440bc7e696..52621c48a34d8 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/templates/bloom-compactor/statefulset-bloom-compactor.yaml b/production/helm/loki/templates/bloom-compactor/statefulset-bloom-compactor.yaml index fbece8f2953ed..424fa4bb65d76 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 353b0203fe79a..e2ceefbeafb5d 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: {} From 3cfb632105158b34b36a99a5cbe669351b2b5f52 Mon Sep 17 00:00:00 2001 From: Everton Seiei Arakaki Date: Wed, 17 Apr 2024 15:27:29 +0200 Subject: [PATCH 2/2] docs: add relevant doc files --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index b3673def27fef..f2c0b7493522a 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.1 + +- [BUGFIX] Add missing toleration blocks to bloom components. + ## 6.2.0 - [FEATURE] Add a headless service to the bloom gateway component. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 413444160fa22..cd1abdde0abdb 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.0 +version: 6.2.1 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 578548edb8d7f..7bde283b2dff7 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.2.0](https://img.shields.io/badge/Version-6.2.0-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.1](https://img.shields.io/badge/Version-6.2.1-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