Merge branch 'monitoring-11.0.0-bb.12' into 'master'

feat(monitoring): Support for custom VirtualService configs

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

chart/templates/monitoring/monitoring-helmrelease.yaml

@@ -45,6 +45,20 @@ spec:
     hostname: {{ .Values.hostname }}
     istio:
       enabled: {{ .Values.istio.enabled }}
+    {{- if .Values.monitoring.sso.enabled }}
+      prometheus:
+        enabled: true
+        service: authservice-haproxy-sso
+        port: 8080
+        namespace: authservice
+      alertmanager:
+        enabled: true
+        service: authservice-haproxy-sso
+        port: 8080
+        namespace: authservice
+      grafana:
+        enabled: true
+    {{- end }}
     sso:
       enabled: {{ .Values.monitoring.sso.enabled }}
     global:
@@ -79,17 +93,6 @@ spec:
     kube-state-metrics:
       imagePullSecrets:
       - name: private-registry
-{{- if .Values.monitoring.sso.enabled }}
-    ingress:
-      prometheus:
-        service: authservice-haproxy-sso
-        port: 8080
-        namespace: authservice
-      alertmanager:
-        service: authservice-haproxy-sso
-        port: 8080
-        namespace: authservice
-{{- end }}
 
   # TODO: DRY this up
   {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}

chart/values.yaml

@@ -158,7 +158,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "11.0.0-bb.10"
+    tag: "11.0.0-bb.12"
   sso:
     enabled: false
     prometheus: