From a00c1cdef6e04c6e75df531d73eef16d50058dd7 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Sun, 31 Mar 2024 16:45:31 +0200 Subject: [PATCH 1/7] fix hpa selector for loki-distributed Signed-off-by: Gritzko Daniel Kleiner --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/templates/_helpers.tpl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 5ce722bf85..163a0c08db 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.9.5 -version: 0.78.4 +version: 0.78.5 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/templates/_helpers.tpl b/charts/loki-distributed/templates/_helpers.tpl index 749debb2e1..5096875bbf 100644 --- a/charts/loki-distributed/templates/_helpers.tpl +++ b/charts/loki-distributed/templates/_helpers.tpl @@ -145,11 +145,11 @@ Return the appropriate apiVersion for PodDisruptionBudget. Return the appropriate apiVersion for HorizontalPodAutoscaler. */}} {{- define "loki.hpa.apiVersion" -}} - {{- if and (.Capabilities.APIVersions.Has "autoscaling/v2") (semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version) -}} - {{- print "autoscaling/v2" -}} - {{- else -}} - {{- print "autoscaling/v2beta1" -}} - {{- end -}} + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + {{- "autoscaling/v2" }} + {{- else }} + {{- "autoscaling/v2beta2" }} + {{- end }} {{- end -}} {{- define "loki.ingester.readinessProbe" -}} From 8f4d3fc4aa71b664c10039db5ff420d3200a0048 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Tue, 9 Apr 2024 08:29:11 -0300 Subject: [PATCH 2/7] fix indent suggested by @zanhsieh Signed-off-by: Gritzko Daniel Kleiner --- charts/loki-distributed/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/loki-distributed/templates/_helpers.tpl b/charts/loki-distributed/templates/_helpers.tpl index 5096875bbf..f0ebac6941 100644 --- a/charts/loki-distributed/templates/_helpers.tpl +++ b/charts/loki-distributed/templates/_helpers.tpl @@ -145,11 +145,11 @@ Return the appropriate apiVersion for PodDisruptionBudget. Return the appropriate apiVersion for HorizontalPodAutoscaler. */}} {{- define "loki.hpa.apiVersion" -}} - {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} - {{- "autoscaling/v2" }} - {{- else }} - {{- "autoscaling/v2beta2" }} - {{- end }} +{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} +{{- "autoscaling/v2" }} +{{- else }} +{{- "autoscaling/v2beta2" }} +{{- end }} {{- end -}} {{- define "loki.ingester.readinessProbe" -}} From fdddb5933e0230c6323a2a018874a948a7e8a3d5 Mon Sep 17 00:00:00 2001 From: MH Date: Wed, 1 May 2024 21:25:35 +0800 Subject: [PATCH 3/7] Update README.md Signed-off-by: MH --- 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 d40ea8b510..40ce68f285 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.79.0](https://img.shields.io/badge/Version-0.79.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) +![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode From 5b6339dea1a12a02d3cbe0f4b44709ad53b3a342 Mon Sep 17 00:00:00 2001 From: MH Date: Wed, 1 May 2024 21:25:53 +0800 Subject: [PATCH 4/7] Update Chart.yaml Signed-off-by: MH --- charts/loki-distributed/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index cd10726fde..e1f63554c1 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application -appVersion: 2.9.7 -version: 0.79.0 +appVersion: 2.9.6 +version: 0.79.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki From 2bc1d12584e24a285d2dd84544ea19098abc74b9 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Mon, 13 May 2024 17:44:24 +0200 Subject: [PATCH 5/7] include print statement Signed-off-by: Gritzko Daniel Kleiner --- charts/loki-distributed/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/loki-distributed/templates/_helpers.tpl b/charts/loki-distributed/templates/_helpers.tpl index f0ebac6941..51a90630af 100644 --- a/charts/loki-distributed/templates/_helpers.tpl +++ b/charts/loki-distributed/templates/_helpers.tpl @@ -145,11 +145,11 @@ Return the appropriate apiVersion for PodDisruptionBudget. Return the appropriate apiVersion for HorizontalPodAutoscaler. */}} {{- define "loki.hpa.apiVersion" -}} -{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} -{{- "autoscaling/v2" }} -{{- else }} -{{- "autoscaling/v2beta2" }} -{{- end }} + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + {{- print "autoscaling/v2" }} + {{- else }} + {{- print "autoscaling/v2beta2" }} + {{- end }} {{- end -}} {{- define "loki.ingester.readinessProbe" -}} From 1f39423e1e51cb1cd5d5cbfe6fa2500c8f5c8fdb Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Mon, 3 Jun 2024 18:17:46 +0200 Subject: [PATCH 6/7] update chart version Signed-off-by: Gritzko Daniel Kleiner --- 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 e1f63554c1..b42c680e06 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.9.6 -version: 0.79.1 +version: 0.79.2 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki From 4a23561ec9dc8d0f30054aeb46fd8f842ad6d15e Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Mon, 3 Jun 2024 18:19:36 +0200 Subject: [PATCH 7/7] chore: update correctly chart version Signed-off-by: Gritzko Daniel Kleiner --- 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 b42c680e06..e1f63554c1 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.9.6 -version: 0.79.2 +version: 0.79.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki