diff --git a/charts/kubezero-metrics/templates/istio-service.yaml b/charts/kubezero-metrics/templates/istio-service.yaml index 2a3490b9..b2437a59 100644 --- a/charts/kubezero-metrics/templates/istio-service.yaml +++ b/charts/kubezero-metrics/templates/istio-service.yaml @@ -12,5 +12,5 @@ spec: http: - route: - destination: - host: grafana + host: metrics-grafana {{- end }} diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index 2a358244..bdadb2c4 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -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" }}