From 4d3da71b0a9ecce3be653d49a2c4c1faa4eb0842 Mon Sep 17 00:00:00 2001
From: Andrew Blanchard <andrew.blanchard@leapfrog.ai>
Date: Thu, 10 Nov 2022 21:10:46 +0000
Subject: [PATCH] Removed promtail condition from Loki values check
---
chart/templates/logging/loki/gitrepository.yaml | 2 +-
chart/templates/logging/loki/imagepullsecret.yaml | 2 +-
chart/templates/logging/loki/loki-helmrelease.yaml | 2 +-
chart/templates/logging/loki/values.yaml | 4 ++--
chart/templates/logging/promtail/promtail-helmrelease.yaml | 3 ++-
chart/templates/logging/promtail/values.yaml | 7 +++++++
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/chart/templates/logging/loki/gitrepository.yaml b/chart/templates/logging/loki/gitrepository.yaml
index 12901ce6ce..b5ff4ef770 100644
--- a/chart/templates/logging/loki/gitrepository.yaml
+++ b/chart/templates/logging/loki/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.offline) (or .Values.loki.enabled .Values.promtail.enabled) }}
+{{- if and (not .Values.offline) .Values.loki.enabled }}
apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: GitRepository
metadata:
diff --git a/chart/templates/logging/loki/imagepullsecret.yaml b/chart/templates/logging/loki/imagepullsecret.yaml
index ee27a6926a..680cae918b 100644
--- a/chart/templates/logging/loki/imagepullsecret.yaml
+++ b/chart/templates/logging/loki/imagepullsecret.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.loki.enabled .Values.promtail.enabled }}
+{{- if .Values.loki.enabled }}
{{- if ( include "imagePullSecret" . ) }}
apiVersion: v1
kind: Secret
diff --git a/chart/templates/logging/loki/loki-helmrelease.yaml b/chart/templates/logging/loki/loki-helmrelease.yaml
index 5f9de64419..6a38553f53 100644
--- a/chart/templates/logging/loki/loki-helmrelease.yaml
+++ b/chart/templates/logging/loki/loki-helmrelease.yaml
@@ -1,5 +1,5 @@
{{- $fluxSettingsLoki := merge .Values.loki.flux .Values.flux -}}
-{{- if or .Values.loki.enabled .Values.promtail.enabled }}
+{{- if .Values.loki.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
diff --git a/chart/templates/logging/loki/values.yaml b/chart/templates/logging/loki/values.yaml
index f75d5401d3..4b79796931 100644
--- a/chart/templates/logging/loki/values.yaml
+++ b/chart/templates/logging/loki/values.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.loki.enabled .Values.promtail.enabled }}
+{{- if .Values.loki.enabled }}
{{- include "values-secret" (dict "root" $ "package" .Values.loki "name" "loki" "defaults" (include "bigbang.defaults.loki" .)) }}
{{- end }}
@@ -35,7 +35,7 @@ monitoring:
{{- end }}
istio:
- enabled: {{ .Values.istio.enabled }}
+ enabled: {{ .Values.istio.enabled }}
loki:
storage:
diff --git a/chart/templates/logging/promtail/promtail-helmrelease.yaml b/chart/templates/logging/promtail/promtail-helmrelease.yaml
index 34dea54aca..a92789b853 100644
--- a/chart/templates/logging/promtail/promtail-helmrelease.yaml
+++ b/chart/templates/logging/promtail/promtail-helmrelease.yaml
@@ -37,10 +37,11 @@ spec:
kind: Secret
valuesKey: "overlays"
-{{/* promtail _always_ depend on .Values.loki being enabled, so can assume they exist here */}}
dependsOn:
+ {{- if .Values.loki.enabled }}
- name: loki
namespace: {{ .Release.Namespace }}
+ {{- end }}
{{- if .Values.gatekeeper.enabled }}
- name: gatekeeper
namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/logging/promtail/values.yaml b/chart/templates/logging/promtail/values.yaml
index 693d6c4559..6bbc8a3b3d 100644
--- a/chart/templates/logging/promtail/values.yaml
+++ b/chart/templates/logging/promtail/values.yaml
@@ -52,4 +52,11 @@ config:
- url: http://logging-loki-write.logging.svc.cluster.local:3100/loki/api/v1/push
{{- end }}
{{- end }}
+# If loki is disabled and promtail is not
+{{- if and (not .Values.loki.enabled) (.Values.promtail.enabled) }}
+# Promtail must have config.clients provided
+{{- if or (empty .Values.promtail.values.config) (empty .Values.promtail.values.config.clients) }}
+{{- fail "If Promtail is enabled and Loki is disabled, at least one client must be provided via '.Values.promtail.values.config.clients'"}}
+{{- end -}}
+{{- end -}}
{{- end -}}
--
GitLab