From 2e80ea34850d4662a8322617c7b4558aad024e8c Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Sun, 15 Dec 2024 14:55:33 +0330 Subject: [PATCH 1/5] Added minReadySeconds for metrics generator Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 3 ++- .../metrics-generator/deployment-metrics-generator.yaml | 2 +- .../metrics-generator/statefulset-metrics-generator.yaml | 2 +- charts/tempo-distributed/values.yaml | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 848f3a26f0..a0dd8f0187 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.26.1 +version: 1.26.2 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 39974f02d7..d8f87e7541 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.1](https://img.shields.io/badge/Version-1.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -666,6 +666,7 @@ The memcached default args are removed and should be provided manually. The sett | metricsGenerator.initContainers | list | `[]` | | | metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] | | metricsGenerator.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| metricsGenerator.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods | | metricsGenerator.persistence | object | `{"annotations":{},"enabled":false,"size":"10Gi","storageClass":null}` | Persistence configuration for metrics-generator | | metricsGenerator.persistence.annotations | object | `{}` | Annotations for metrics generator PVCs | diff --git a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml index 55c7094ea1..84d73284c5 100644 --- a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml @@ -12,7 +12,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.metricsGenerator.minReadySeconds }} replicas: {{ .Values.metricsGenerator.replicas }} revisionHistoryLimit: 10 selector: diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index f057fba246..95cac8b8d6 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -12,7 +12,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.metricsGenerator.minReadySeconds }} replicas: {{ .Values.metricsGenerator.replicas }} revisionHistoryLimit: 10 podManagementPolicy: Parallel diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 68e2157433..f0adb7d1f4 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -372,6 +372,8 @@ metricsGenerator: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for metrics-generator pods nodeSelector: {} # -- Tolerations for metrics-generator pods From bdbcddd84689caa01988b0d6da0bc0862bb6a36d Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 11:46:38 +0330 Subject: [PATCH 2/5] Added minReadySeconds Signed-off-by: xogoodnow --- .../templates/compactor/deployment-compactor.yaml | 2 +- .../templates/distributor/deployment-distributor.yaml | 2 +- .../templates/gateway/deployment-gateway.yaml | 2 +- .../templates/querier/deployment-querier.yaml | 2 +- .../query-frontend/deployment-query-frontend.yaml | 2 +- charts/tempo-distributed/values.yaml | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index 37f5342204..58b47b800e 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -11,7 +11,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.compactor.minReadySeconds }} replicas: {{ .Values.compactor.replicas }} revisionHistoryLimit: 10 selector: diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index c7495b3832..3b846573f3 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -11,7 +11,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.distributor.minReadySeconds }} {{- if not .Values.distributor.autoscaling.enabled }} replicas: {{ .Values.distributor.replicas }} {{- end }} diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index ea6cd5dd34..a72ee6959f 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -8,7 +8,7 @@ metadata: labels: {{- include "tempo.labels" $dict | nindent 4 }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.gateway.minReadySeconds }} {{- if not .Values.gateway.autoscaling.enabled }} replicas: {{ .Values.gateway.replicas }} {{- end }} diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 8412589860..809c4fd597 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -11,7 +11,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.querier.minReadySeconds }} {{- if not .Values.querier.autoscaling.enabled }} replicas: {{ .Values.querier.replicas }} {{- end }} diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index 01f05b21cf..161fa80e8b 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -11,7 +11,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - minReadySeconds: 10 + minReadySeconds: {{ .Values.queryFrontend.minReadySeconds }} {{- if not .Values.queryFrontend.autoscaling.enabled }} replicas: {{ .Values.queryFrontend.replicas }} {{- end }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f0adb7d1f4..aad70c9a11 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -548,6 +548,8 @@ distributor: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for distributor pods nodeSelector: {} # -- Tolerations for distributor pods @@ -644,6 +646,8 @@ compactor: terminationGracePeriodSeconds: 30 # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for compactor pods nodeSelector: {} # -- Tolerations for compactor pods @@ -760,6 +764,8 @@ querier: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for querier pods nodeSelector: {} # -- Tolerations for querier pods @@ -975,6 +981,8 @@ queryFrontend: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for query-frontend pods nodeSelector: {} # -- Tolerations for query-frontend pods @@ -1875,6 +1883,8 @@ gateway: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating + minReadySeconds: 10 # -- Node selector for gateway pods nodeSelector: {} # -- Tolerations for gateway pods From 7974c469522b8b0a6ec9fb055f0266ebd9b9eee7 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 12:11:12 +0330 Subject: [PATCH 3/5] Ran helm docs Signed-off-by: xogoodnow --- charts/tempo-distributed/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index d8f87e7541..05192239b2 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -308,6 +308,7 @@ The memcached default args are removed and should be provided manually. The sett | compactor.image.repository | string | `nil` | Docker image repository for the compactor image. Overrides `tempo.image.repository` | | compactor.image.tag | string | `nil` | Docker image tag for the compactor image. Overrides `tempo.image.tag` | | compactor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| compactor.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.podAnnotations | object | `{}` | Annotations for compactor pods | | compactor.podLabels | object | `{}` | Labels for compactor pods | @@ -342,6 +343,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` | | distributor.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` | | distributor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| distributor.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | distributor.nodeSelector | object | `{}` | Node selector for distributor pods | | distributor.podAnnotations | object | `{}` | Annotations for distributor pods | | distributor.podLabels | object | `{}` | Labels for distributor pods | @@ -476,6 +478,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.ingress.labels | object | `{}` | Labels for the gateway ingress | | gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress | | gateway.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| gateway.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating | | gateway.nginxConfig.httpSnippet | string | `""` | Allows appending custom configuration to the http block | | gateway.nginxConfig.logFormat | string | `"main '$remote_addr - $remote_user [$time_local] $status '\n '\"$request\" $body_bytes_sent \"$http_referer\" '\n '\"$http_user_agent\" \"$http_x_forwarded_for\"';"` | NGINX log format | @@ -737,6 +740,7 @@ The memcached default args are removed and should be provided manually. The sett | querier.image.repository | string | `nil` | Docker image repository for the querier image. Overrides `tempo.image.repository` | | querier.image.tag | string | `nil` | Docker image tag for the querier image. Overrides `tempo.image.tag` | | querier.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| querier.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | querier.nodeSelector | object | `{}` | Node selector for querier pods | | querier.podAnnotations | object | `{}` | Annotations for querier pods | | querier.podLabels | object | `{}` | Labels for querier pods | @@ -784,6 +788,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.ingress.hosts | list | `[{"host":"query.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the Jaeger ingress | | queryFrontend.ingress.tls | list | `[{"hosts":["query.tempo.example.com"],"secretName":"tempo-query-tls"}]` | TLS configuration for the Jaeger ingress | | queryFrontend.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | +| queryFrontend.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | queryFrontend.nodeSelector | object | `{}` | Node selector for query-frontend pods | | queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods | | queryFrontend.podLabels | object | `{}` | Labels for queryFrontend pods | From d028fb72656ef779c5130ca8e9d1aff0843c793d Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 17:59:24 +0330 Subject: [PATCH 4/5] Bumbped version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a0dd8f0187..bc14f9b5db 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.26.2 +version: 1.26.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 05192239b2..9f8e583864 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.3](https://img.shields.io/badge/Version-1.26.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 761c174f22ac36fe821e68f41166691156ec877e Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 18:13:12 +0330 Subject: [PATCH 5/5] Bumbped chart version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a0dd8f0187..bc14f9b5db 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.26.2 +version: 1.26.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ea3f3c77d7..9fd2fa9648 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.3](https://img.shields.io/badge/Version-1.26.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode