diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index e0f2fe9dc3829..b3600fca72969 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3063,7 +3063,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs", - "tag": "3.3.0" + "tag": "weekly-k236-8cbd50a" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3080,7 +3080,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k236-8cbd50a" }, "labels": {}, "nodeSelector": {}, @@ -3236,7 +3236,7 @@ null string Docker image tag
-"3.3.0"
+"weekly-k236-8cbd50a"
 
@@ -3268,7 +3268,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k236-8cbd50a" }, "labels": {}, "nodeSelector": {}, @@ -3349,7 +3349,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k236-8cbd50a" } @@ -3395,7 +3395,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"weekly-k236-8cbd50a"
 
@@ -6093,7 +6093,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-"3.3.2"
+"k236-8e260fe"
 
@@ -6531,7 +6531,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/loki-canary", - "tag": null + "tag": "k236-8e260fe" } @@ -6577,7 +6577,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"k236-8e260fe"
 
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 15dec2f255e80..9aa8d8eddf266 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.25.0-weekly.236 + +- [CHANGE] Changed version of Grafana Loki to k236-8e260fe +- [CHANGE] Changed version of Grafana Enterprise Logs to weekly-k236-8cbd50a + ## 6.24.0 - [BUGFIX] Add conditional to include ruler config only if `ruler.enabled=true` diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 594dcdf085e9f..bc24eb393386c 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.2 -version: 6.24.0 +appVersion: k236 +version: 6.25.0-weekly.236 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 f51bdaf79640b..5bbc491ef1102 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![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) +![Version: 6.25.0-weekly.236](https://img.shields.io/badge/Version-6.25.0--weekly.236-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: k236](https://img.shields.io/badge/AppVersion-k236-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 2af9e32015888..262832eaf4b1e 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.2 + tag: k236-8e260fe # -- 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.0 + tag: weekly-k236-8cbd50a # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -609,7 +609,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs-provisioner # -- Overrides the image tag whose default is the chart's appVersion - tag: null + tag: weekly-k236-8cbd50a # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -706,7 +706,7 @@ lokiCanary: # -- Docker image repository repository: grafana/loki-canary # -- Overrides the image tag whose default is the chart's appVersion - tag: null + tag: k236-8e260fe # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy