diff --git a/_shared-workflows-dockerhub-login b/_shared-workflows-dockerhub-login new file mode 160000 index 0000000000000..95f1d8ce881e0 --- /dev/null +++ b/_shared-workflows-dockerhub-login @@ -0,0 +1 @@ +Subproject commit 95f1d8ce881e09d28bb548ae77b2a61578dd49ad diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 5dfd74ea279d2..2829451d25d11 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.0" + "tag": "weekly-k231-8b87365" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3079,7 +3079,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k231-8b87365" }, "labels": {}, "nodeSelector": {}, @@ -3235,7 +3235,7 @@ null string Docker image tag
-"3.3.0"
+"weekly-k231-8b87365"
 
@@ -3267,7 +3267,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k231-8b87365" }, "labels": {}, "nodeSelector": {}, @@ -3348,7 +3348,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k231-8b87365" } @@ -3394,7 +3394,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"weekly-k231-8b87365"
 
@@ -6090,7 +6090,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-"3.3.0"
+"k231-be4f17e"
 
@@ -6524,7 +6524,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/loki-canary", - "tag": null + "tag": "k231-be4f17e" } @@ -6570,7 +6570,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"k231-be4f17e"
 
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index eac1c61615101..518781b7a75f1 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.23.0-weekly.231 + +- [CHANGE] Changed version of Grafana Loki to k231-be4f17e +- [CHANGE] Changed version of Grafana Enterprise Logs to weekly-k231-8b87365 + ## 6.22.0 ## 6.20.0 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index ce11a1a5c2c4f..0840c49d8c987 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.0 -version: 6.22.0 +appVersion: k231 +version: 6.23.0-weekly.231 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 6651f00748afb..010802f1ba8fb 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.22.0](https://img.shields.io/badge/Version-6.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.0](https://img.shields.io/badge/AppVersion-3.3.0-informational?style=flat-square) +![Version: 6.23.0-weekly.231](https://img.shields.io/badge/Version-6.23.0--weekly.231-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: k231](https://img.shields.io/badge/AppVersion-k231-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 78961a7243009..617560415ba2f 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.0 + tag: k231-be4f17e # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -518,7 +518,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.3.0 + tag: weekly-k231-8b87365 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -605,7 +605,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-k231-8b87365 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -702,7 +702,7 @@ lokiCanary: # -- Docker image repository repository: grafana/loki-canary # -- Overrides the image tag whose default is the chart's appVersion - tag: null + tag: k231-be4f17e # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy