Merge branch 'redis-6-metrics-authservice' into 'master'

Redis 6 metrics authservice

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

chart/templates/authservice/authservice-helmrelease.yaml

@@ -38,9 +38,13 @@ spec:
       kind: Secret
       valuesKey: "overlays"
 
-  {{- if .Values.istio.enabled }}
   dependsOn:
+  {{- if .Values.istio.enabled }}
   - name: istio
     namespace: {{ .Release.Namespace }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+  {{- if .Values.monitoring.enabled }}
+  - name: monitoring
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+{{- end }}

chart/templates/authservice/values.yaml

@@ -17,6 +17,9 @@ podAnnotations:
 
 openshift: {{ .Values.openshift }}
 
+monitoring:
+  enabled: {{ .Values.monitoring.enabled }}
+
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   ingressLabels:
@@ -24,6 +27,21 @@ networkPolicies:
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
     {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
 
+{{- if and (dig "redis" "enabled" false .Values.addons.authservice.values) .Values.monitoring.enabled }}
+redis-bb:
+  metrics:
+    enabled: true 
+    image:
+      pullSecrets:
+        - private-registry
+    serviceMonitor:
+      enabled: true
+      namespace: authservice
+      selector: 
+        app.kubernetes.io/name: redis-bb
+        app.kubernetes.io/instance: authservice-authservice
+{{- end }}
+
 global:
   oidc:
     host: {{ .Values.sso.oidc.host }}

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 .Values.monitoring.sso.enabled }}
+  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
   dependsOn:
   {{- if .Values.istio.enabled }}
     - name: istio
@@ -48,9 +48,5 @@ spec:
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
   {{- end }}
-  {{- if .Values.monitoring.sso.enabled }}
-    - name: authservice
-      namespace: {{ .Release.Namespace }}
-  {{- end }}
   {{- end }}
 {{- end }}

chart/values.yaml

@@ -597,7 +597,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/authservice.git
       path: "./chart"
-      tag: "0.4.0-bb.18"
+      tag: "0.4.0-bb.19"
 
     # -- Flux reconciliation overrides specifically for the Authservice Package
     flux: {}