Merge branch 'update-monitoring-tag-60.1.0-bb.0' into 'master'

monitoring update to 60.1.0-bb.0

Closes big-bang/product/packages/monitoring#229, big-bang/product/packages/monitoring#227, and big-bang/product/packages/monitoring#226

See merge request !4519

chart/templates/authservice/values.yaml

@@ -8,6 +8,12 @@
 
 istio:
   enabled: {{ .Values.istio.enabled }}
+  hardened:
+    {{- if or (dig "istio" "hardened" "enabled" false .Values.monitoring.values) (dig "istio" "hardened" "enabled" false .Values.addons.authservice.values) (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) }}
+    enabled: true
+    {{- else}}
+    enabled: false
+    {{- end }}
 
 image: 
   pullPolicy: {{ .Values.imagePullPolicy }}

chart/templates/grafana/values.yaml

@@ -36,7 +36,7 @@ istio:
   {{- $grafanaInjection := dig "istio" "injection" "enabled" .Values.grafana }}
   enabled: {{ .Values.istio.enabled }}
   hardened:
-    {{- if or (dig "values" "istio" "hardened" "enabled" false .Values.monitoring) (dig "values" "istio" "hardened" "enabled" false .Values.grafana) }}
+    {{- if or (dig "istio" "hardened" "enabled" false .Values.monitoring.values) (dig "istio" "hardened" "enabled" false .Values.addons.authservice.values) (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) }}
     enabled: true
     {{- else }}
     enabled: false

chart/templates/istio/values.yaml

@@ -81,6 +81,13 @@ values:
     jwksResolverExtraRootCA: {{ default (dig "certificateAuthority" "cert" "" .Values.sso) .Values.sso.certificate_authority | quote }}
 {{- end }}
 
+hardened:
+  {{- if or (dig "istio" "hardened" "enabled" false .Values.monitoring.values) (dig "istio" "hardened" "enabled" false .Values.addons.authservice.values) (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) }}
+  enabled: true
+  {{- else}}
+  enabled: false
+  {{- end }}
+
 {{- if .Values.istio.ingressGateways }}
 ingressGateways:
   istio-ingressgateway:

chart/templates/monitoring/values.yaml

@@ -39,7 +39,7 @@ istio:
   {{- $monitoringInjection := dig "istio" "injection" "enabled" .Values.monitoring }}
   enabled: {{ .Values.istio.enabled }}
   hardened:
-    {{- if or (dig "values" "istio" "hardened" "enabled" false .Values.monitoring) (dig "values" "istio" "hardened" "enabled" false .Values.grafana) }}
+    {{- if or (dig "istio" "hardened" "enabled" false .Values.monitoring.values) (dig "istio" "hardened" "enabled" false .Values.addons.authservice.values) (dig "hardened" "enabled" false .Values.istio.values) (dig "istio" "hardened" "enabled" false .Values.grafana.values) }}
     enabled: true
     {{- else }}
     enabled: false

chart/values.yaml

@@ -873,11 +873,11 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/monitoring.git
     path: "./chart"
-    tag: "59.1.0-bb.1"
+    tag: "60.1.0-bb.0"
   helmRepo:
     repoName: "registry1"
     chartName: "monitoring"
-    tag: "59.1.0-bb.1"
+    tag: "60.1.0-bb.0"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux:

tests/test-values.yaml

@@ -72,6 +72,8 @@ istio:
         key: "" # Gets added via chart/ingress-certs.yaml
         cert: "" # Gets added via chart/ingress-certs.yaml
   values:
+    hardened:
+      enabled: true
     kiali:
       dashboard:
         auth: