diff --git a/chart/templates/logging/loki/values.yaml b/chart/templates/logging/loki/values.yaml index 128704174979c9687e34475ab277abace1ff05a5..50fc216e4ae34047f9c9a427ffc2b0a773a1b546 100644 --- a/chart/templates/logging/loki/values.yaml +++ b/chart/templates/logging/loki/values.yaml @@ -47,6 +47,10 @@ loki: region: {{ .Values.loki.objectStorage.region }} accessKeyId: {{ .Values.loki.objectStorage.accessKey }} secretAccessKey: {{ .Values.loki.objectStorage.accessSecret }} + {{- if .Values.istio.enabled }} + podAnnotations: + {{ include "istioAnnotation" . }} + {{- end }} {{- with .Values.loki.objectStorage }} {{- if and (eq $.Values.loki.strategy "scalable") (not (and .endpoint .region)) }} @@ -55,11 +59,6 @@ minio: {{- end }} {{- end }} -{{- if .Values.istio.enabled }} -podAnnotations: - {{ include "istioAnnotation" . }} -{{- end }} - monolith: enabled: {{ eq .Values.loki.strategy "monolith" }} serviceMonitor: @@ -73,6 +72,12 @@ monolith: keyFile: /etc/prom-certs/key.pem insecureSkipVerify: true # Prometheus does not support Istio security naming, thus skip verifying target pod certificate {{- end }} + + {{- if .Values.istio.enabled }} + podAnnotations: + {{ include "istioAnnotation" . }} + {{- end }} + {{- if (eq .Values.loki.strategy "monolith") }} read: disabled: true