Merge branch 'main' into mburgos/Adding_commonLabels_to_tempo-distributed

Author: Sheikh-Abubaker

charts/tempo-distributed/README.md

@@ -355,6 +355,8 @@ The memcached default args are removed and should be provided manually. The sett
 | compactor.replicas | int | `1` | Number of replicas for the compactor |
 | compactor.resources | object | `{}` | Resource requests and limits for the compactor |
 | compactor.service.annotations | object | `{}` | Annotations for compactor service |
+| compactor.strategy.rollingUpdate.maxSurge | int | `0` |  |
+| compactor.strategy.rollingUpdate.maxUnavailable | int | `1` |  |
 | compactor.terminationGracePeriodSeconds | int | `30` | Grace period to allow the compactor to shutdown before it is killed |
 | compactor.tolerations | list | `[]` | Tolerations for compactor pods |
 | config | string | See values.yaml | Config file contents for Tempo distributed. Passed through the `tpl` function to allow templating |

charts/tempo-distributed/templates/compactor/deployment-compactor.yaml

@@ -19,10 +19,10 @@ spec:
   selector:
     matchLabels:
       {{- include "tempo.selectorLabels" $dict | nindent 6 }}
+{{- with .Values.compactor.strategy }}
   strategy:
-    rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
+{{- toYaml . | nindent 4 }}
+{{- end }}
   template:
     metadata:
       labels:

charts/tempo-distributed/values.yaml

@@ -669,7 +669,11 @@ compactor:
   replicas: 1
   # -- Annotations for compactor deployment
   annotations: {}
-
+  # Strategy of updating pods
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   # -- Autoscaling configurations
   autoscaling:
     # -- Enable autoscaling for the compactor