Merge branch 'monitoring-istio-annotations' into 'master'

Add Istio Annotations to Monitoring

Closes #957

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

chart/templates/monitoring/values.yaml

@@ -58,12 +58,18 @@ alertmanager:
         imagePullPolicy: {{ .Values.imagePullPolicy }}
       - name: "config-reloader"
         imagePullPolicy: {{ .Values.imagePullPolicy }}
-    {{- if .Values.monitoring.sso.enabled }}
-    {{- $alertmanagerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
-    {{- $alertmanagerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
+    {{- if or .Values.monitoring.sso.enabled .Values.istio.enabled }}
     podMetadata:
+      {{- if .Values.monitoring.sso.enabled }}
+      {{- $alertmanagerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
+      {{- $alertmanagerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
       labels:
         {{ $alertmanagerAuthserviceKey }}: {{ $alertmanagerAuthserviceValue }}
+      {{- end }}
+      {{- if .Values.istio.enabled }}
+      annotations:
+        {{ include "istioAnnotation" . }}
+      {{- end }}
     {{- end }}
 prometheus:
   prometheusSpec:
@@ -74,12 +80,18 @@ prometheus:
         imagePullPolicy: {{ .Values.imagePullPolicy }}
       - name: "config-reloader"
         imagePullPolicy: {{ .Values.imagePullPolicy }}
-    {{- if .Values.monitoring.sso.enabled }}
-    {{- $prometheusAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
-    {{- $prometheusAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
+    {{- if or .Values.monitoring.sso.enabled .Values.istio.enabled }}
     podMetadata:
+      {{- if .Values.monitoring.sso.enabled }}
+      {{- $prometheusAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
+      {{- $prometheusAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
       labels:
         {{ $prometheusAuthserviceKey }}: {{ $prometheusAuthserviceValue }}
+      {{- end }}
+      {{- if .Values.istio.enabled }}
+      annotations:
+        {{ include "istioAnnotation" . }}
+      {{- end }}
     {{- end }}
 
 anchore:
@@ -106,6 +118,11 @@ grafana:
   sidecar:
     imagePullPolicy: {{ .Values.imagePullPolicy }}
 
+  {{- if .Values.istio.enabled }}
+  podAnnotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
+
   {{- if .Values.loki.enabled }}
   additionalDataSources:
   - name: Loki
@@ -153,6 +170,11 @@ prometheus-node-exporter:
     imagePullSecrets:
     - name: private-registry
 
+  {{- if .Values.istio.enabled }}
+  podAnnotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
+
   {{- if .Values.openshift }}
   service:
     targetPort: 9102
@@ -165,6 +187,11 @@ kube-state-metrics:
   imagePullSecrets:
   - name: private-registry
 
+  {{- if .Values.istio.enabled }}
+  podAnnotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
+
 prometheusOperator:      
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}      
@@ -175,4 +202,9 @@ prometheusOperator:
     patch:           
       image:            
         pullPolicy: {{ .Values.imagePullPolicy }}
+
+  {{- if .Values.istio.enabled }}
+  podAnnotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
 {{- end -}}