diff --git a/_shared-workflows-dockerhub-login b/_shared-workflows-dockerhub-login new file mode 160000 index 0000000000000..df4dfd1d74626 --- /dev/null +++ b/_shared-workflows-dockerhub-login @@ -0,0 +1 @@ +Subproject commit df4dfd1d746263d6a8aa7ef601b0906b5b851668 diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 0e5b534e10851..75191e9d359c0 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": "weekly-k232-c4696a8" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3079,7 +3079,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k232-c4696a8" }, "labels": {}, "nodeSelector": {}, @@ -3235,7 +3235,7 @@ null string Docker image tag
-"3.3.1"
+"weekly-k232-c4696a8"
 
@@ -3267,7 +3267,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k232-c4696a8" }, "labels": {}, "nodeSelector": {}, @@ -3348,7 +3348,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs-provisioner", - "tag": null + "tag": "weekly-k232-c4696a8" } @@ -3394,7 +3394,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"weekly-k232-c4696a8"
 
@@ -6090,7 +6090,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-"3.3.1"
+"k232-17f1972"
 
@@ -6528,7 +6528,7 @@ true "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/loki-canary", - "tag": null + "tag": "k232-17f1972" } @@ -6574,7 +6574,7 @@ null string Overrides the image tag whose default is the chart's appVersion
-null
+"k232-17f1972"
 
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index dfc51d67d0a42..8b157481440af 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.24.0-weekly.232 + +- [CHANGE] Changed version of Grafana Loki to k232-17f1972 +- [CHANGE] Changed version of Grafana Enterprise Logs to weekly-k232-c4696a8 + ## 6.23.0 - [CHANGE] Changed version of Grafana Loki to 3.3.1 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index e1b62848c2e0b..0d6746860ae42 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: k232 +version: 6.24.0-weekly.232 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 bbc39ed7c4bef..06eb09ea89a81 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-weekly.232](https://img.shields.io/badge/Version-6.24.0--weekly.232-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: k232](https://img.shields.io/badge/AppVersion-k232-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 855e589a097cb..3b6f81ea4fc54 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: k232-17f1972 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -520,7 +520,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.3.1 + tag: weekly-k232-c4696a8 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -607,7 +607,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-k232-c4696a8 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -704,7 +704,7 @@ lokiCanary: # -- Docker image repository repository: grafana/loki-canary # -- Overrides the image tag whose default is the chart's appVersion - tag: null + tag: k232-17f1972 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy