From 56b6cd8b1e2a748365feb181a1ba05076fd5d49a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Tue, 2 Jan 2024 18:24:49 +0530 Subject: [PATCH 1/4] Added missing default values to support ServerSideApply Signed-off-by: Sheikh-Abubaker --- production/helm/loki/templates/monitoring/pod-logs.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/templates/monitoring/pod-logs.yaml b/production/helm/loki/templates/monitoring/pod-logs.yaml index 4445f3e760779..3fc95c44e22b6 100644 --- a/production/helm/loki/templates/monitoring/pod-logs.yaml +++ b/production/helm/loki/templates/monitoring/pod-logs.yaml @@ -19,7 +19,8 @@ spec: pipelineStages: - cri: { } relabelings: - - sourceLabels: + - action: replace + sourceLabels: - __meta_kubernetes_pod_node_name targetLabel: __host__ - action: labelmap @@ -42,7 +43,8 @@ spec: sourceLabels: - __meta_kubernetes_pod_container_name targetLabel: container - - replacement: "{{ include "loki.clusterLabel" $ }}" + - action: replace + replacement: "{{ include "loki.clusterLabel" $ }}" targetLabel: cluster {{- with .relabelings }} {{- toYaml . | nindent 4 }} From 6295c80d71c93617d5e9843956867403c8766fa2 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Tue, 2 Jan 2024 18:52:28 +0530 Subject: [PATCH 2/4] Bumped Helm chart version Signed-off-by: Sheikh-Abubaker --- 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 626523e1bae4d..15654b89ba0e1 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.) +## 5.41.5 + +- [ENHANCEMENT] Added missing default values to support ServerSideApply + ## 5.41.4 - [CHANGE] Use `/ingester/shutdown?terminate=false` for write `preStop` hook diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 095e2745a364a..1e08c0c8f0d1e 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: 2.9.3 -version: 5.41.4 +version: 5.41.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 2857f553e13f7..ec3360d378d76 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.4](https://img.shields.io/badge/Version-5.41.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.5](https://img.shields.io/badge/Version-5.41.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode From b97fe95f17cd5f78ee902f453c001dff06bb1371 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 24 Jan 2024 17:08:15 +0530 Subject: [PATCH 3/4] Fixed lint error and conflicts Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index f00472462d6f5..edc1b39bbcdcb 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,7 +13,7 @@ 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.) -## 5.41.8 +## 5.41.9 - [ENHANCEMENT] Added missing default values to support ServerSideApply diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 8b5402bc9dbd8..7fe326a2ce18a 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: 2.9.3 -version: 5.41.8 +version: 5.41.9 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 33730c361d31e..08f896a97efef 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.8](https://img.shields.io/badge/Version-5.41.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.9](https://img.shields.io/badge/Version-5.41.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode From abe75e96a175b201e2130968afc91a2bbb04f90a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 19 Feb 2024 21:30:00 +0530 Subject: [PATCH 4/4] Resolved conflicts Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 5 ++++- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 2ae99af502b51..0ec4124ab9ed6 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,9 +13,12 @@ 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.) -## 5.43.2 +## 5.43.3 - [ENHANCEMENT] Added missing default values to support ServerSideApply + +## 5.43.2 + - [BUGFIX] Added `alibabacloud` to `isUsingObjectStorage` check. ## 5.43.1 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index c20abdba25d80..fc9b3a32e434e 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: 2.9.4 -version: 5.43.2 +version: 5.43.3 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 86a13201c2ebd..30f3b75790257 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.43.2](https://img.shields.io/badge/Version-5.43.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) +![Version: 5.43.3](https://img.shields.io/badge/Version-5.43.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode