diff --git a/chart/templates/grafana/values.yaml b/chart/templates/grafana/values.yaml index 18f0d66feeccb788357b2493b0804ee47e4d01fd..5bb45aea8b225e21b5a80eecb3799478fd2a147b 100644 --- a/chart/templates/grafana/values.yaml +++ b/chart/templates/grafana/values.yaml @@ -36,7 +36,7 @@ istio: {{- $grafanaInjection := dig "istio" "injection" "enabled" .Values.grafana }} enabled: {{ .Values.istio.enabled }} hardened: - {{- if or (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) }} + {{- if or (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) }} enabled: true {{- else }} enabled: false diff --git a/chart/templates/istio/values.yaml b/chart/templates/istio/values.yaml index 0b9bc3b25d9349d4631b5ba8b2e5f36d6ee7d1e1..7396d92e7e63ebc3076bf066092851f20c871952 100644 --- a/chart/templates/istio/values.yaml +++ b/chart/templates/istio/values.yaml @@ -82,7 +82,7 @@ values: {{- end }} hardened: - {{- if or (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) }} + {{- if or (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) }} enabled: true {{- else}} enabled: false diff --git a/chart/templates/loki/values.yaml b/chart/templates/loki/values.yaml index 0e57cef109c4745f856d20f0fc9f9fb369d9c754..614b3af24b46c1c67eb84ea1a6138895024789c5 100644 --- a/chart/templates/loki/values.yaml +++ b/chart/templates/loki/values.yaml @@ -12,7 +12,7 @@ openshift: {{ .Values.openshift }} istio: enabled: {{ .Values.istio.enabled }} hardened: - {{- if or (dig "istio" "hardened" "enabled" false .Values.loki.values) (dig "istio" "hardened" "enabled" false .Values.elasticsearchKibana.values) }} + {{- if or (dig "istio" "hardened" "enabled" false .Values.loki.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) (dig "hardened" "enabled" false .Values.istio.values) }} enabled: true {{- else }} enabled: false diff --git a/chart/values.yaml b/chart/values.yaml index be8773a5d8cd57e001269d889e8527abad6bc107..fc429e3c009afd1590b507d5945cd9f501169aec 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -696,11 +696,11 @@ loki: git: repo: https://repo1.dso.mil/big-bang/product/packages/loki.git path: "./chart" - tag: "6.6.4-bb.0" + tag: "6.6.4-bb.1" helmRepo: repoName: "registry1" chartName: "loki" - tag: "6.6.4-bb.0" + tag: "6.6.4-bb.1" # -- Flux reconciliation overrides specifically for the Loki Package flux: {}