master #9

Merged
stefan merged 96 commits from master into stable 2020-08-24 11:15:28 +00:00
2 changed files with 8 additions and 6 deletions
Showing only changes of commit 161fbf9fa2 - Show all commits

View File

@ -12,5 +12,5 @@ spec:
http:
- route:
- destination:
host: grafana
host: metrics-grafana
{{- end }}

View File

@ -94,12 +94,14 @@ kubezero:
metrics:
enabled: {{ .Values.metrics.enabled }}
{{- if and .Values.metrics.istio.enabled .Values.istio.enabled }}
istio:
{{- with .Values.metrics.istio }}
{{- toYaml . | nindent 6 }}
values:
{{- if and .Values.metrics.istio.enabled .Values.istio.enabled }}
grafana:
istio:
{{- with .Values.metrics.istio }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- end }}
{{- end }}
argo-cd:
{{- with index .Values "argo-cd" "server" }}