Config fixes, svc name fix

2020-08-03 16:34:57 +01:00 · 2020-08-03 16:34:57 +01:00 · 6461fc7036
commit 6461fc7036
parent 3b36e4939f
2 changed files with 8 additions and 6 deletions
--- 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 }}
--- 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" }}