From c5b5c149b0b58b60e8bddbe81fb1911d56e74b8c Mon Sep 17 00:00:00 2001 From: Christian Zunker Date: Thu, 1 Jul 2021 13:12:59 +0200 Subject: [PATCH 1/5] Fix automountServiceAccountToken Signed-off-by: Christian Zunker --- charts/loki-distributed/templates/serviceaccount.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/loki-distributed/templates/serviceaccount.yaml b/charts/loki-distributed/templates/serviceaccount.yaml index 676adad207..0a2c6e35e8 100644 --- a/charts/loki-distributed/templates/serviceaccount.yaml +++ b/charts/loki-distributed/templates/serviceaccount.yaml @@ -9,8 +9,8 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} -{{- with .Values.serviceAccount.imagePullSecrets }} automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} +{{- with .Values.serviceAccount.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} {{- end }} From d95a25b17bf7c02b36428c96df247ea88a6f5650 Mon Sep 17 00:00:00 2001 From: Christian Zunker Date: Thu, 1 Jul 2021 13:44:30 +0200 Subject: [PATCH 2/5] Fix conflicts Signed-off-by: Christian Zunker --- charts/loki-distributed/ci/ingress-values.yaml | 9 +++++++++ charts/loki-distributed/templates/serviceaccount.yaml | 1 + 2 files changed, 10 insertions(+) create mode 100644 charts/loki-distributed/ci/ingress-values.yaml diff --git a/charts/loki-distributed/ci/ingress-values.yaml b/charts/loki-distributed/ci/ingress-values.yaml new file mode 100644 index 0000000000..b6beb94af6 --- /dev/null +++ b/charts/loki-distributed/ci/ingress-values.yaml @@ -0,0 +1,9 @@ +gateway: + ingress: + enabled: true + annotations: {} + hosts: + - host: gateway.loki.example.com + paths: + - path: / + pathType: Prefix diff --git a/charts/loki-distributed/templates/serviceaccount.yaml b/charts/loki-distributed/templates/serviceaccount.yaml index 0a2c6e35e8..436ff14a57 100644 --- a/charts/loki-distributed/templates/serviceaccount.yaml +++ b/charts/loki-distributed/templates/serviceaccount.yaml @@ -15,3 +15,4 @@ imagePullSecrets: {{- toYaml . | nindent 2 }} {{- end }} {{- end }} + From 1bf0433a3c92d459990268415b1a249dec0bf79a Mon Sep 17 00:00:00 2001 From: Christian Zunker Date: Mon, 27 Sep 2021 07:01:56 +0200 Subject: [PATCH 3/5] Update docs Signed-off-by: Christian Zunker --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 85d1914b50..65ed6c001a 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.3.0 -version: 0.37.3 +version: 0.37.4 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index af493e1e63..80c50bcd8a 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.37.3](https://img.shields.io/badge/Version-0.37.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 0.37.4](https://img.shields.io/badge/Version-0.37.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode From 6614c7fc516bc52c346711ea70b439e3500d1ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Tue, 12 Oct 2021 19:29:22 +0200 Subject: [PATCH 4/5] Bump chart version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reinhard Nägele --- charts/loki-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 1aa5d04909..2c72e314e2 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.3.0 -version: 0.38.0 +version: 0.38.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki From 1baf2d4a67a26dd515ce41b46c444029cc888233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Tue, 12 Oct 2021 19:32:24 +0200 Subject: [PATCH 5/5] Fix readme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reinhard Nägele --- charts/loki-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 6ea39a7430..a6b82c772f 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.38.0](https://img.shields.io/badge/Version-0.38.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 0.38.1](https://img.shields.io/badge/Version-0.38.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode