From c4ead4b710b56fed6977c14b2a4881b45f4ad0fb Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 22 Feb 2024 14:36:54 +0530 Subject: [PATCH] feat: area/helm: Added missing default values to support ServerSideApply (#11567) Signed-off-by: Sheikh-Abubaker Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Co-authored-by: Karsten Jeschkies --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/templates/monitoring/pod-logs.yaml | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 59487c984d6e3..0ec4124ab9ed6 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.43.3 + +- [ENHANCEMENT] Added missing default values to support ServerSideApply + ## 5.43.2 - [BUGFIX] Added `alibabacloud` to `isUsingObjectStorage` check. 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 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 }}