UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit de84da36 authored by Micah Nagel's avatar Micah Nagel
Browse files

Kiali: Handle dependencies better

parent ebb58b20
No related branches found
No related tags found
1 merge request!798Kiali: Handle dependencies better
{{- if .Values.kiali.enabled }} {{- if and .Values.kiali.enabled (dig "grafana" "enabled" true .Values.monitoring.values) }}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
......
...@@ -37,19 +37,23 @@ cr: ...@@ -37,19 +37,23 @@ cr:
{{- end }} {{- end }}
external_services: external_services:
grafana: grafana:
enabled: {{ dig "grafana" "enabled" true .Values.monitoring.values }}
{{- $grafanaUrl := first (dig "istio" "grafana" "hosts" list .Values.monitoring.values) }} {{- $grafanaUrl := first (dig "istio" "grafana" "hosts" list .Values.monitoring.values) }}
url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" .Values.hostname)) . }} url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" .Values.hostname)) . }}
{{- if (dig "grafana" "enabled" true .Values.monitoring.values) }}
auth: auth:
{{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }} {{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
{{- $userKey := (dig "grafana" "admin" "userKey" "admin-user" .Values.monitoring.values) }} {{- $userKey := (dig "grafana" "admin" "userKey" "admin-user" .Values.monitoring.values) }}
{{- with lookup "v1" "Secret" "monitoring" .Values.monitoring.values.grafana.admin.existingSecret }} {{- with lookup "v1" "Secret" "monitoring" .Values.monitoring.values.grafana.admin.existingSecret }}
username: {{ (get .data $userKey | b64dec) | default "admin" }} username: {{ (get .data $userKey | b64dec) | default "admin" }}
{{- end }} {{- end }}
{{- else }} {{- else }}
username: {{ dig "grafana" "adminUser" "admin" .Values.monitoring.values }} username: {{ dig "grafana" "adminUser" "admin" .Values.monitoring.values }}
{{- end }} {{- end }}
password: "secret:grafana-auth:password" password: "secret:grafana-auth:password"
{{- end }}
tracing: tracing:
enabled: {{ .Values.jaeger.enabled }}
{{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }} {{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }}
url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" .Values.hostname)) . }} url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" .Values.hostname)) . }}
istio: istio:
......
...@@ -31,6 +31,8 @@ graph LR ...@@ -31,6 +31,8 @@ graph LR
end end
``` ```
NOTE: Prometheus is required for Kiali to function properly; Jaeger and Grafana are optional (although all are part of Big Bang Core).
### Storage ### Storage
Kiali does not have any persistent storage, all data is accessed live/directly from Jaeger/Monitoring services. Kiali does not have any persistent storage, all data is accessed live/directly from Jaeger/Monitoring services.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment