From 288707b0efbf3dab13f50262217f791e7e5b10d0 Mon Sep 17 00:00:00 2001
From: mr-bot <project2872_bot1@noreply.repo1.dso.mil>
Date: Fri, 28 Oct 2022 20:07:12 +0000
Subject: [PATCH] Updated keycloak git tag

---
 chart/templates/keycloak/values.yaml | 10 ++++++++++
 chart/values.yaml                    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/chart/templates/keycloak/values.yaml b/chart/templates/keycloak/values.yaml
index fb660bff1c..f4f4d231e5 100644
--- a/chart/templates/keycloak/values.yaml
+++ b/chart/templates/keycloak/values.yaml
@@ -45,6 +45,16 @@ monitoring:
   enabled: {{ .Values.monitoring.enabled }}
 serviceMonitor:
   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.addons.keycloak.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
+    # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
+    insecureSkipVerify: true
+  {{- end }}
 
 {{- if .Values.addons.keycloak.database.host }}
 postgresql:
diff --git a/chart/values.yaml b/chart/values.yaml
index 4d4cb5caf6..74b1c9b65f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1375,7 +1375,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/keycloak.git
       path: "./chart"
-      tag: "18.2.1-bb.4"
+      tag: "18.2.1-bb.5"
 
     database:
       # -- Hostname of a pre-existing database to use for Keycloak.
-- 
GitLab