UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit f7f9733f authored by joshwolf's avatar joshwolf
Browse files

Merge branch 'fluent-fixes' into 'master'

fix fluent conditionals

Currently fluents conditionals are all completely different. MR sets them to all exist on the same condition `fluentbit.enabled`.

Can definitely make this conditional something else, `logging.enabled` + `fluentbit.enabled` for example, just wanted to put this MR out to fix the issue of them being all different - feel free to comment what the correct conditional should be in your opinion :D

See merge request platform-one/big-bang/bigbang!426
parents 997c85e3 9b37736a
No related branches found
No related tags found
1 merge request!426fix fluent conditionals
Pipeline #224967 passed
{{- if .Values.logging.enabled }}
{{- if .Values.fluentbit.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
......
{{- if and (not .Values.offline) (or .Values.logging.enabled .Values.clusterAuditor.enabled) }}
{{- if and (not .Values.offline) (.Values.fluentbit.enabled) }}
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: GitRepository
metadata:
......
{{- if and .Values.logging.enabled .Values.fluentbit.enabled }}
{{- if .Values.fluentbit.enabled }}
{{- include "values-secret" (dict "root" $ "package" .Values.fluentbit "name" "fluentbit" "defaults" (include "bigbang.defaults.fluentbit" .)) }}
{{- end }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment