From 2f647f2c7075e004df0266cb5d4a805728893be6 Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Tue, 27 Sep 2022 14:31:31 -0600
Subject: [PATCH] Adjusting loki istio version annotations since refactor
---
chart/templates/logging/loki/values.yaml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/chart/templates/logging/loki/values.yaml b/chart/templates/logging/loki/values.yaml
index 1287041749..50fc216e4a 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
--
GitLab