Merge branch 'grafana-kiali-fix' into 'master'

Fix Grafana <-> Kiali secret

Closes #1689

See merge request !3070

chart/templates/kiali/grafana-auth-secret.yaml

-{{- if and .Values.kiali.enabled (dig "grafana" "enabled" true .Values.monitoring.values) }}
+{{- if and .Values.kiali.enabled .Values.grafana.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -10,12 +10,12 @@ metadata:
     {{- include "commonLabels" . | nindent 4}}
 type: kubernetes.io/opaque
 stringData:
-{{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
-  {{- $passwordKey := (dig "grafana" "admin" "passwordKey" "admin-password" .Values.monitoring.values) }}
-  {{- with lookup "v1" "Secret" "monitoring" .Values.monitoring.values.grafana.admin.existingSecret }}
+{{- if (dig "admin" "existingSecret" "" .Values.grafana.values) }}
+  {{- $passwordKey := (dig "admin" "passwordKey" "admin-password" .Values.grafana.values) }}
+  {{- with lookup "v1" "Secret" "monitoring" .Values.grafana.values.admin.existingSecret }}
   password: {{ (get .data $passwordKey | b64dec) | default "prom-operator" }}
   {{- end }}
 {{- else }}
-  password: {{ dig "grafana" "adminPassword" "prom-operator" .Values.monitoring.values }}
+  password: {{ dig "adminPassword" "prom-operator" .Values.grafana.values }}
 {{- end }}
 {{- end }}