From eb4b89a0ac672ab4a02511a7484e99c7ac6415ee Mon Sep 17 00:00:00 2001 From: Connor Harris Date: Mon, 24 Jul 2023 17:38:52 -0700 Subject: [PATCH 1/6] Templatizing maxSurge for deployments Signed-off-by: Connor Harris --- charts/loki-distributed/Chart.yaml | 2 +- .../templates/distributor/deployment-distributor.yaml | 2 +- .../templates/ingester/deployment-ingester.yaml | 4 ++++ .../templates/querier/deployment-querier.yaml | 2 +- charts/loki-distributed/values.yaml | 6 ++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index ff4e918183..bbca4691a0 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.8.2 -version: 0.70.1 +version: 0.70.2 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/templates/distributor/deployment-distributor.yaml b/charts/loki-distributed/templates/distributor/deployment-distributor.yaml index 10265184f8..ec81788279 100644 --- a/charts/loki-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/loki-distributed/templates/distributor/deployment-distributor.yaml @@ -16,7 +16,7 @@ spec: {{- end }} strategy: rollingUpdate: - maxSurge: 0 + maxSurge: {{ .Values.distributor.maxSurge }} maxUnavailable: 1 revisionHistoryLimit: {{ .Values.loki.revisionHistoryLimit }} selector: diff --git a/charts/loki-distributed/templates/ingester/deployment-ingester.yaml b/charts/loki-distributed/templates/ingester/deployment-ingester.yaml index b5a1a82c7f..3049bb8aaa 100644 --- a/charts/loki-distributed/templates/ingester/deployment-ingester.yaml +++ b/charts/loki-distributed/templates/ingester/deployment-ingester.yaml @@ -15,6 +15,10 @@ spec: {{- if not .Values.ingester.autoscaling.enabled }} replicas: {{ .Values.ingester.replicas }} {{- end }} + strategy: + rollingUpdate: + maxSurge: {{ .Values.ingester.maxSurge }} + maxUnavailable: 1 revisionHistoryLimit: {{ .Values.loki.revisionHistoryLimit }} selector: matchLabels: diff --git a/charts/loki-distributed/templates/querier/deployment-querier.yaml b/charts/loki-distributed/templates/querier/deployment-querier.yaml index bb00b9801a..5a8c219662 100644 --- a/charts/loki-distributed/templates/querier/deployment-querier.yaml +++ b/charts/loki-distributed/templates/querier/deployment-querier.yaml @@ -17,7 +17,7 @@ spec: {{- end }} strategy: rollingUpdate: - maxSurge: 0 + maxSurge: {{ .Values.querier.maxSurge }} maxUnavailable: 1 revisionHistoryLimit: {{ .Values.loki.revisionHistoryLimit }} selector: diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index b4156eb5e7..fdd96d4f90 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -439,6 +439,8 @@ ingester: topologyKey: failure-domain.beta.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: null + # -- Max Surge for ingester pods + maxSurge: 0 # -- Node selector for ingester pods nodeSelector: {} # -- Tolerations for ingester pods @@ -537,6 +539,8 @@ distributor: topologyKey: failure-domain.beta.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: null + # -- Max Surge for distributor pods + maxSurge: 0 # -- Node selector for distributor pods nodeSelector: {} # -- Tolerations for distributor pods @@ -623,6 +627,8 @@ querier: topologyKey: failure-domain.beta.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: null + # -- Max Surge for querier pods + maxSurge: 0 # -- Node selector for querier pods nodeSelector: {} # -- Tolerations for querier pods From c312ddf9752e2a6ff2c5c0496211269e106cf358 Mon Sep 17 00:00:00 2001 From: YuleZ Date: Wed, 26 Jul 2023 13:29:45 +0200 Subject: [PATCH 2/6] add hostAliases Signed-off-by: YuleZ --- charts/tempo-vulture/templates/deployment.yaml | 4 ++++ charts/tempo-vulture/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/charts/tempo-vulture/templates/deployment.yaml b/charts/tempo-vulture/templates/deployment.yaml index f0d8009f61..5ef3089291 100644 --- a/charts/tempo-vulture/templates/deployment.yaml +++ b/charts/tempo-vulture/templates/deployment.yaml @@ -34,6 +34,10 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.hostAliases }} + hostAliases: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: {{ include "tempo-vulture.serviceAccountName" . }} containers: - name: tempo-vulture diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 15ae60a467..f056143a49 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -4,6 +4,11 @@ nameOverride: "" fullnameOverride: "" # -- Image pull secrets for Docker images imagePullSecrets: [] +# -- hostAliases to add +hostAliases: [] +# - ip: 1.2.3.4 +# hostnames: +# - domain.tld image: # -- Docker image repository From 64585cdd76e2da6c26e67688699915c1f8cfd574 Mon Sep 17 00:00:00 2001 From: YuleZ Date: Wed, 26 Jul 2023 13:29:58 +0200 Subject: [PATCH 3/6] bump version Signed-off-by: YuleZ --- charts/tempo-vulture/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 8687127409..cb4a382862 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.2.4 +version: 0.3.0 appVersion: 2.1.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From a4f62e20ca82a90afd6b8a0b6115f901c37d9454 Mon Sep 17 00:00:00 2001 From: MH Date: Thu, 27 Jul 2023 06:42:22 +0800 Subject: [PATCH 4/6] Update README.md Signed-off-by: MH --- charts/loki-distributed/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 87ee4d539c..82be74b829 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.70.5](https://img.shields.io/badge/Version-0.70.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square) +![Version: 0.70.6](https://img.shields.io/badge/Version-0.70.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -127,6 +127,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | distributor.image.registry | string | `nil` | The Docker registry for the distributor image. Overrides `loki.image.registry` | | distributor.image.repository | string | `nil` | Docker image repository for the distributor image. Overrides `loki.image.repository` | | distributor.image.tag | string | `nil` | Docker image tag for the distributor image. Overrides `loki.image.tag` | +| distributor.maxSurge | int | `0` | Max Surge for distributor pods | | distributor.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | distributor.nodeSelector | object | `{}` | Node selector for distributor pods | | distributor.podAnnotations | object | `{}` | Annotations for distributor pods | @@ -260,6 +261,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.initContainers | list | `[]` | Init containers to add to the ingester pods | | ingester.kind | string | `"StatefulSet"` | Kind of deployment [StatefulSet/Deployment] | | ingester.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | +| ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | | ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | @@ -454,6 +456,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | querier.image.repository | string | `nil` | Docker image repository for the querier image. Overrides `loki.image.repository` | | querier.image.tag | string | `nil` | Docker image tag for the querier image. Overrides `loki.image.tag` | | querier.initContainers | list | `[]` | Init containers to add to the querier pods | +| querier.maxSurge | int | `0` | Max Surge for querier pods | | querier.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | querier.nodeSelector | object | `{}` | Node selector for querier pods | | querier.persistence.annotations | object | `{}` | Annotations for querier PVCs | From 7c6f152afdefb6059055b0c9f1328f36baa11be6 Mon Sep 17 00:00:00 2001 From: YuleZ Date: Thu, 27 Jul 2023 11:02:31 +0200 Subject: [PATCH 5/6] regenerate docs Signed-off-by: YuleZ --- charts/tempo-vulture/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 5efc065a52..3c9f10b0cf 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. @@ -54,6 +54,7 @@ tempoAddress: | extraEnv | list | `[]` | Environment variables to add to the vulture pods | | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the vulture pods | | fullnameOverride | string | `""` | Overrides the chart's computed fullname | +| hostAliases | list | `[]` | hostAliases to add | | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | image.repository | string | `"docker.io/grafana/tempo-vulture"` | Docker image repository | | image.tag | string | `""` | Overrides the image tag whose default is the chart's appVersion | From b6fa2edc2cbb302aa8804bd13c28be5962251676 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Thu, 27 Jul 2023 14:45:28 -0400 Subject: [PATCH 6/6] [agent-operator] Bump Grafana Agent Operator version to v0.35.2 (#2554) Signed-off-by: Robert Fratto --- charts/agent-operator/Chart.yaml | 8 ++++---- charts/agent-operator/README.md | 6 +++--- charts/agent-operator/values.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index ef89a05a05..1cae4eb573 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.2.18 -appVersion: "0.35.1" +version: 0.2.19 +appVersion: "0.35.2" home: https://grafana.com/docs/agent/v0.35/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.35.1/docs/sources/assets/logo_and_name.png +icon: https://raw.githubusercontent.com/grafana/agent/v0.35.2/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.35.1/pkg/operator + - https://github.com/grafana/agent/tree/v0.35.2/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 5c6dbf7226..59b39c7e8d 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.2.18](https://img.shields.io/badge/Version-0.2.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.35.1](https://img.shields.io/badge/AppVersion-0.35.1-informational?style=flat-square) +![Version: 0.2.19](https://img.shields.io/badge/Version-0.2.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.35.2](https://img.shields.io/badge/AppVersion-0.35.2-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -62,7 +62,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.35.1"` | Image tag | +| image.tag | string | `"v0.35.2"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index 8515d56974..044ac9472a 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.35.1 + tag: v0.35.2 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets