From abe75e96a175b201e2130968afc91a2bbb04f90a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 19 Feb 2024 21:30:00 +0530 Subject: [PATCH] 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