Merge branch 'fix-j-svcm' into 'master'

Fix Jaeger SvcMonitor conditional placement

Closes #1307

See merge request platform-one/big-bang/bigbang!2098

chart/templates/jaeger/values.yaml

@@ -28,16 +28,16 @@ annotations:
 
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}
+  # conditional passes only for default istio: enabled, mTLS: SCRICT
+  {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.jaeger.values) "STRICT") }}
   serviceMonitor:
-    # conditional passes only for default istio: enabled, mTLS: SCRICT
-    {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.jaeger.values) "STRICT") }}
     scheme: https
     tlsConfig:
       caFile: /etc/prom-certs/root-cert.pem
       certFile: /etc/prom-certs/cert-chain.pem
       keyFile: /etc/prom-certs/key.pem
       insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
-    {{- end }}
+  {{- end }}
 
 elasticsearch:
   enabled: {{ .Values.logging.enabled }}