From adb38aca6c9343596afb7cc027aa7147974f2a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <pmalek@sumologic.com>
Date: Wed, 3 Mar 2021 19:13:34 +0100
Subject: [PATCH] Make pdb definitions and usage consistent

---
 deploy/helm/sumologic/templates/_helpers.tpl     | 4 ++++
 deploy/helm/sumologic/templates/logs-pdb.yaml    | 6 ++++--
 deploy/helm/sumologic/templates/metrics-pdb.yaml | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl
index 5620ab6a57..84996f4f46 100644
--- a/deploy/helm/sumologic/templates/_helpers.tpl
+++ b/deploy/helm/sumologic/templates/_helpers.tpl
@@ -312,6 +312,10 @@ helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
 {{ template "sumologic.metadata.name.logs" . }}
 {{- end -}}
 
+{{- define "sumologic.metadata.name.logs.pdb" -}}
+{{ template "sumologic.metadata.name.logs.statefulset" . }}-pdb
+{{- end -}}
+
 {{- define "sumologic.metadata.name.logs.hpa" -}}
 {{- template "sumologic.metadata.name.logs" . }}
 {{- end -}}
diff --git a/deploy/helm/sumologic/templates/logs-pdb.yaml b/deploy/helm/sumologic/templates/logs-pdb.yaml
index cad100f8b0..cca3255c11 100644
--- a/deploy/helm/sumologic/templates/logs-pdb.yaml
+++ b/deploy/helm/sumologic/templates/logs-pdb.yaml
@@ -1,11 +1,13 @@
+{{- if and .Values.sumologic.logs.enabled .Values.fluentd.logs.enabled -}}
 {{- if .Values.fluentd.logs.podDisruptionBudget -}}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ template "sumologic.metadata.name.logs.statefulset" . }}-pdb
+  name: {{ template "sumologic.metadata.name.logs.pdb" . }}
 spec:
   selector:
     matchLabels:
       app: {{ template "sumologic.labels.app.logs.statefulset" . }}
 {{ toYaml .Values.fluentd.logs.podDisruptionBudget | indent 2 }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+{{- end -}}
diff --git a/deploy/helm/sumologic/templates/metrics-pdb.yaml b/deploy/helm/sumologic/templates/metrics-pdb.yaml
index bab50aa3d7..862b58a38f 100644
--- a/deploy/helm/sumologic/templates/metrics-pdb.yaml
+++ b/deploy/helm/sumologic/templates/metrics-pdb.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.sumologic.metrics.enabled true) (eq .Values.fluentd.metrics.enabled true) -}}
+{{- if and .Values.sumologic.metrics.enabled .Values.fluentd.metrics.enabled -}}
 {{- if .Values.fluentd.metrics.podDisruptionBudget -}}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget