diff --git a/_shared-workflows-dockerhub-login b/_shared-workflows-dockerhub-login new file mode 160000 index 0000000000000..338682acb9523 --- /dev/null +++ b/_shared-workflows-dockerhub-login @@ -0,0 +1 @@ +Subproject commit 338682acb95238001a1ea995e660d229e78d4e20 diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 81619a5de0a46..a0ab8fa7676e2 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3062,7 +3062,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs", - "tag": "3.3.1" + "tag": "3.3.0" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3235,7 +3235,7 @@ null string Docker image tag
-"3.3.1"
+"3.3.0"
 
@@ -6092,7 +6092,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-"3.3.1"
+"3.3.2"
 
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index e96e637490e54..15dec2f255e80 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,8 +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.) +## 6.24.0 + - [BUGFIX] Add conditional to include ruler config only if `ruler.enabled=true` - [BUGFIX] Disables the Helm test pod when `test.enabled=false`. +- [BUGFIX] Fix `enterprise.image.tag` to `3.3.0` +- [ENHANCEMENT] Bump Loki version to 3.3.2 ## 6.23.0 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 3fb3a57af3965..cb5dce02c0f10 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: loki description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. type: application -appVersion: 3.3.1 -version: 6.23.0 +appVersion: 3.3.2 +version: 6.24.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 5b1fd3e16a522..cb7a223652b12 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.23.0](https://img.shields.io/badge/Version-6.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 6.24.0](https://img.shields.io/badge/Version-6.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.2](https://img.shields.io/badge/AppVersion-3.3.2-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 92546ff585d85..2af9e32015888 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -56,7 +56,7 @@ loki: # -- Docker image repository repository: grafana/loki # -- Overrides the image tag whose default is the chart's appVersion - tag: 3.3.1 + tag: 3.3.2 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -522,7 +522,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.3.1 + tag: 3.3.0 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy