diff --git a/chart/templates/loki/values.yaml b/chart/templates/loki/values.yaml index a717f95686183ac03dc6cf01061c8e64130a5620..6ab72475368f4992a2a5eb92a5bd206303505985 100644 --- a/chart/templates/loki/values.yaml +++ b/chart/templates/loki/values.yaml @@ -11,16 +11,26 @@ openshift: {{ .Values.openshift }} istio: enabled: {{ .Values.istio.enabled }} - hardened: - enabled: {{ or + {{- if or + (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.monitoring.values) (dig "istio" "hardened" "enabled" false .Values.addons.authservice.values) - (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) (dig "istio" "hardened" "enabled" false .Values.loki.values) (dig "istio" "hardened" "enabled" false .Values.eckOperator.values) (dig "istio" "hardened" "enabled" false .Values.elasticsearchKibana.values) - }} + }} + hardened: + enabled: true + monitoring: + enabled: {{ .Values.monitoring.enabled }} + promtail: + enabled: {{ .Values.promtail.enabled }} + fluentbit: + enabled: {{ .Values.fluentbit.enabled }} + minioOperator: + enabled: {{ .Values.addons.minioOperator.enabled }} + {{- end }} imagePullSecrets: - name: private-registry