chart/templates/haproxy/gitrepository.yaml

-{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled }}
+{{- $monitoringInjection := dig "istio" "injection" "enabled" .Values.monitoring }}
+{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled (eq $monitoringInjection "disabled") }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
@@ -15,4 +16,4 @@ spec:
     {{- include "validRef" .Values.addons.haproxy.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" . | nindent 2 }}
-{{- end }}
\ No newline at end of file
+{{- end }}

chart/templates/haproxy/haproxy-authservice.yaml

 {{- $fluxSettingsHaProxy := merge .Values.addons.haproxy.flux .Values.flux -}}
-{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled }}
+{{- $monitoringInjection := dig "istio" "injection" "enabled" .Values.monitoring }}
+{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled (eq $monitoringInjection "disabled") }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -46,4 +47,4 @@ spec:
       namespace: {{ .Release.Namespace }}
     {{- end }}
 
-{{- end }}
\ No newline at end of file
+{{- end }}

chart/templates/haproxy/values.yaml

-{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled }}
+{{- $monitoringInjection := dig "istio" "injection" "enabled" .Values.monitoring }}
+{{- if and .Values.istio.enabled .Values.monitoring.sso.enabled (eq $monitoringInjection "disabled") }}
 {{- include "values-secret" (dict "root" $ "package" .Values.addons.haproxy "name" "haproxy-sso" "defaults" (include "bigbang.defaults.haproxy-sso" .)) }}
 {{- end }}
 

chart/templates/monitoring/monitoring-helmrelease.yaml

@@ -38,7 +38,7 @@ spec:
       valuesKey: "overlays"
 
   # TODO: DRY this up
-  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
+  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled .Values.monitoring.sso.enabled }}
   dependsOn:
   {{- if .Values.istio.enabled }}
     - name: istio
@@ -48,5 +48,9 @@ spec:
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
   {{- end }}
+  {{- if .Values.monitoring.sso.enabled }}
+    - name: authservice
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
   {{- end }}
 {{- end }}

chart/templates/monitoring/namespace.yaml

@@ -7,5 +7,5 @@ metadata:
     app.kubernetes.io/name: monitoring
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
-    istio-injection: disabled
-{{- end }}
\ No newline at end of file
+    istio-injection: {{ dig "istio" "injection" "enabled" .Values.monitoring }}
+{{- end }}

chart/templates/monitoring/values.yaml

@@ -22,10 +22,11 @@ minioOperator:
   enabled: {{ .Values.addons.minioOperator.enabled }}
   
 istio:
+  {{- $monitoringInjection := dig "istio" "injection" "enabled" .Values.monitoring }}
   enabled: {{ .Values.istio.enabled }}
   prometheus:
     enabled: true
-    {{- if .Values.monitoring.sso.enabled }}
+    {{- if and .Values.monitoring.sso.enabled (eq $monitoringInjection "disabled") }}
     service: authservice-haproxy-sso
     port: 8080
     namespace: authservice
@@ -34,7 +35,7 @@ istio:
     - istio-system/{{ default "public" .Values.monitoring.ingress.gateway }}
   alertmanager:
     enabled: true
-    {{- if .Values.monitoring.sso.enabled }}
+    {{- if and .Values.monitoring.sso.enabled (eq $monitoringInjection "disabled") }}
     service: authservice-haproxy-sso
     port: 8080
     namespace: authservice
@@ -45,10 +46,31 @@ istio:
     enabled: true
     gateways:
     - istio-system/{{ default "public" .Values.monitoring.ingress.gateway }}
+  injection: {{ dig "istio" "injection" "enabled" .Values.monitoring }}
+
+{{- if .Values.monitoring.sso.enabled }}
+alertmanager:
+  alertmanagerSpec:
+    {{- $alertmanagerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
+    {{- $alertmanagerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
+    podMetadata:
+      labels:
+        {{ $alertmanagerAuthserviceKey }}: {{ $alertmanagerAuthserviceValue }}
+prometheus:
+  prometheusSpec:
+    {{- $prometheusAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
+    {{- $prometheusAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
+    podMetadata:
+      labels:
+        {{ $prometheusAuthserviceKey }}: {{ $prometheusAuthserviceValue }}
+{{- end }}
 
 anchore:
   enabled: {{ .Values.addons.anchore.enabled }}
 
+kiali:
+  enabled: {{ .Values.kiali.enabled }}
+
 global:
   imagePullSecrets:
   - name: private-registry

chart/values.yaml

@@ -398,7 +398,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "14.0.0-bb.11"
+    tag: "14.0.0-bb.17"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux: