From 696dc1cd313a606134d04150c7d621b1ddd3ad83 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:21:08 +0000 Subject: [PATCH] [CI/CD] Automated Update Update yaml file `./production/helm/loki/values.yaml` Update helm chart in `production/helm/loki` folder ci_link: https://drone.grafana.net/grafana/enterprise-logs/8302/1/5 commit_link: https://github.com/grafana/enterprise-logs/compare/v3.1.0 repo: grafana/enterprise-logs --- docs/sources/setup/install/helm/reference.md | 2 +- production/helm/loki/CHANGELOG.md | 5 +++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/values.yaml | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 03f9d17f26984..e319086bf8dd2 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -2640,7 +2640,7 @@ null "tolerations": [] }, "useExternalLicense": false, - "version": "3.0.1" + "version": "3.1.0" } diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index f6f45b65f4db8..a331af6d881c6 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,11 @@ 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.7.0 + +- [CHANGE] Changed version of Grafana Enterprise Logs to 3.1.0 + + ## 6.6.5 - [BUGFIX] Fix querier address in SingleBinary mode diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index a5669bfc4607f..14500b78b3962 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 and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. type: application appVersion: 3.0.0 -version: 6.6.5 +version: 6.7.0 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 1365bc2d070f1..1197ff2090bf9 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.6.5](https://img.shields.io/badge/Version-6.6.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) +![Version: 6.7.0](https://img.shields.io/badge/Version-6.7.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) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 359217fc7e219..9de6584cbeda4 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -450,7 +450,7 @@ enterprise: # Enable enterprise features, license must be provided enabled: false # Default verion of GEL to deploy - version: 3.0.1 + version: 3.1.0 # -- Optional name of the GEL cluster, otherwise will use .Release.Name # The cluster name must match what is in your GEL license cluster_name: null @@ -1011,8 +1011,10 @@ gateway: # @default -- Either `loki.tenants` or `gateway.basicAuth.username` and `gateway.basicAuth.password`. htpasswd: >- {{ if .Values.loki.tenants }} + {{- range $t := .Values.loki.tenants }} {{ htpasswd (required "All tenants must have a 'name' set" $t.name) (required "All tenants must have a 'password' set" $t.password) }} + {{- end }} {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }} # -- Existing basic auth secret to use. Must contain '.htpasswd'