diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml
index 5aae04db3106..e31cf593f8b1 100644
--- a/.github/workflows/helm-ci.yml
+++ b/.github/workflows/helm-ci.yml
@@ -31,7 +31,7 @@ jobs:
- name: Lint Code Base
uses: docker://github/super-linter:v3.17.2
env:
- FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).*
+ FILTER_REGEX_EXCLUDE: .*(CHANGELOG\.md|README\.md|Chart\.yaml|NOTES.txt).*
FILTER_REGEX_INCLUDE: .*production/helm/.*
VALIDATE_ALL_CODEBASE: false
VALIDATE_KUBERNETES_KUBEVAL: false
@@ -85,10 +85,12 @@ jobs:
run: |
kubectl create namespace prometheus
- helm install prometheus prometheus-community/kube-prometheus-stack \
+ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+ helm install --debug prometheus prometheus-community/kube-prometheus-stack \
--namespace prometheus \
--set grafana.enabled=false \
- --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus
+ --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus \
+ --set prometheus.prometheusSpec.scrapeConfigNamespaceSelector.matchLabels.release=prometheus
kubectl --namespace prometheus get pods -l "release=prometheus"
kubectl --namespace prometheus get services -l "release=prometheus"
diff --git a/_shared-workflows-dockerhub-login b/_shared-workflows-dockerhub-login
new file mode 160000
index 000000000000..e34b275767e9
--- /dev/null
+++ b/_shared-workflows-dockerhub-login
@@ -0,0 +1 @@
+Subproject commit e34b275767e9a075ed07c25ef0173dacf5fd4ca6
diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index 5ab32a5fedd5..378b2da7c4c6 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -3042,7 +3042,7 @@ null
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs",
- "tag": null
+ "tag": "weekly-k227-a5ee5f0"
},
"license": {
"contents": "NOTAVALIDLICENSE"
@@ -3059,7 +3059,7 @@ null
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs-provisioner",
- "tag": null
+ "tag": "weekly-k227-a5ee5f0"
},
"labels": {},
"nodeSelector": {},
@@ -3215,7 +3215,7 @@ null
string |
Docker image tag |
-null
+"weekly-k227-a5ee5f0"
|
@@ -3247,7 +3247,7 @@ null
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs-provisioner",
- "tag": null
+ "tag": "weekly-k227-a5ee5f0"
},
"labels": {},
"nodeSelector": {},
@@ -3328,7 +3328,7 @@ true
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs-provisioner",
- "tag": null
+ "tag": "weekly-k227-a5ee5f0"
}
@@ -3374,7 +3374,7 @@ null
string |
Overrides the image tag whose default is the chart's appVersion |
-null
+"weekly-k227-a5ee5f0"
|
@@ -6050,7 +6050,7 @@ null
string |
Overrides the image tag whose default is the chart's appVersion |
-null
+"k227-4309f47"
|
@@ -6484,7 +6484,7 @@ true
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/loki-canary",
- "tag": null
+ "tag": "k227-4309f47"
}
@@ -6530,7 +6530,7 @@ null
string |
Overrides the image tag whose default is the chart's appVersion |
-null
+"k227-4309f47"
|
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 73af7d78fde0..bc4c146f8bd3 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.19.0-weekly.227
+
+- [CHANGE] Changed version of Grafana Loki to k227-4309f47
+- [CHANGE] Changed version of Grafana Enterprise Logs to weekly-k227-a5ee5f0
+
## 6.18.0
- [CHANGE] Added automated weekly releases, which created this release.
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 273bdbbb7db1..16086c02fb1d 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.2.0
-version: 6.18.0
+appVersion: k227
+version: 6.19.0-weekly.227
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 f78406625ac4..91491d4c0c2a 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
# loki
-![Version: 6.18.0](https://img.shields.io/badge/Version-6.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
+![Version: 6.19.0-weekly.227](https://img.shields.io/badge/Version-6.19.0--weekly.227-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: k227](https://img.shields.io/badge/AppVersion-k227-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 8c3c5c3bb6e3..9b81eb89edc0 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: null
+ tag: k227-4309f47
# -- 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: null
+ tag: weekly-k227-a5ee5f0
# -- 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-k227-a5ee5f0
# -- 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: k227-4309f47
# -- Overrides the image tag with an image digest
digest: null
# -- Docker image pull policy