feat: Allow configure podDisruptionBudget

grafana · Dec 21, 2024 · d5d459c · d5d459c
1 parent a3808b6
commit d5d459c
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 64 deletions.
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -3,7 +3,7 @@ name: loki
 description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 type: application
 appVersion: 3.3.2
-version: 6.24.0
+version: 6.24.1
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/production/helm/loki/templates/backend/poddisruptionbudget-backend.yaml b/production/helm/loki/templates/backend/poddisruptionbudget-backend.yaml
@@ -1,5 +1,4 @@
-{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}}
-{{- if and $isSimpleScalable (gt (int .Values.backend.replicas) 1) (not .Values.read.legacyReadTarget ) }}
+{{- if .Values.backend.PodDisruptionBudget.create}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
@@ -11,5 +10,7 @@ spec:
   selector:
     matchLabels:
       {{- include "loki.backendSelectorLabels" . | nindent 6 }}
-  maxUnavailable: 1
+  {{- with .Values.backend.PodDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . | default 1 }}
+  {{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/chunks-cache/poddisruptionbudget-chunks-cache.yaml b/production/helm/loki/templates/chunks-cache/poddisruptionbudget-chunks-cache.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.chunksCache.enabled }}
+{{- if .Values.chunksCache.PodDisruptionBudget.create }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
@@ -12,5 +13,8 @@ spec:
     matchLabels:
       {{- include "loki.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: memcached-chunks-cache
-  maxUnavailable: 1
-{{- end -}}
+  {{- with .Values.chunksCache.PodDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . | default 1 }}
+  {{- end}}
+{{- end }}
+{{- end }}
diff --git a/production/helm/loki/templates/gateway/poddisruptionbudget-gateway.yaml b/production/helm/loki/templates/gateway/poddisruptionbudget-gateway.yaml
@@ -1,4 +1,5 @@
 {{- if and .Values.gateway.enabled }}
+{{- if and .Values.gateway.PodDisruptionBudget.create}}
 {{- if or 
   (and (not .Values.gateway.autoscaling.enabled) (gt (int .Values.gateway.replicas) 1)) 
   (and .Values.gateway.autoscaling.enabled (gt (int .Values.gateway.autoscaling.minReplicas) 1))
@@ -14,6 +15,8 @@ spec:
   selector:
     matchLabels:
       {{- include "loki.gatewaySelectorLabels" . | nindent 6 }}
-  maxUnavailable: 1
+  {{- with .Values.gateway.PodDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . | default 1 }}
+  {{- end}}
 {{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/read/poddisruptionbudget-read.yaml b/production/helm/loki/templates/read/poddisruptionbudget-read.yaml
@@ -1,5 +1,4 @@
-{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}}
-{{- if and $isSimpleScalable (gt (int .Values.read.replicas) 1) }}
+{{- if  .Values.read.PodDisruptionBudget.create }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
@@ -11,5 +10,7 @@ spec:
   selector:
     matchLabels:
       {{- include "loki.readSelectorLabels" . | nindent 6 }}
-  maxUnavailable: 1
+  {{- with .Values.read.PodDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . | default 1 }}
+  {{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/results-cache/poddisruptionbudget-results-cache.yaml b/production/helm/loki/templates/results-cache/poddisruptionbudget-results-cache.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.resultsCache.enabled }}
+{{- if .Values.resultsCache.PodDisruptionBudget.create }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
@@ -12,5 +13,8 @@ spec:
     matchLabels:
       {{- include "loki.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: memcached-results-cache
-  maxUnavailable: 1
-{{- end -}}
+  {{- with .Values.resultsCache.PodDisruptionBudget.maxUnavailable}}    
+  maxUnavailable: {{ . | default 1}}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/production/helm/loki/templates/write/poddisruptionbudget-write.yaml b/production/helm/loki/templates/write/poddisruptionbudget-write.yaml
@@ -1,5 +1,4 @@
-{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}}
-{{- if and $isSimpleScalable (gt (int .Values.write.replicas) 1) }}
+{{- if .Values.write.PodDisruptionBudget.create }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
@@ -11,5 +10,7 @@ spec:
   selector:
     matchLabels:
       {{- include "loki.writeSelectorLabels" . | nindent 6 }}
-  maxUnavailable: 1
+  {{- with .Values.write.PodDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . | default 1 }}
+  {{- end }}
 {{- end }}