Merge branch '112-set-required-labels-for-kiali-update-to-new-umbrella-pattern' into 'master'

grafana update to 8.4.6-bb.1

Closes big-bang/product/packages/grafana#112

See merge request !5008

chart/templates/grafana/values.yaml

@@ -99,6 +99,12 @@ podAnnotations:
   {{- end }}
 {{- end }}
 
+{{- if .Values.kiali.enabled }}
+podLabels:
+  app: {{ "{{ template \"grafana.fullname\" . }}" | quote }}
+  {{- include "kialiVersionLabel" . | nindent 2 }}
+{{- end }}
+
 {{- if or .Values.monitoring.enabled .Values.loki.enabled .Values.tempo.enabled $gitlabRedis $authserviceRedisEnabled .Values.addons.argocd.enabled }}
 datasources:
   datasourcesbb.yaml:

chart/values.yaml

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