From 987ad6aef08aceed67c2b4d397b3bb4725098e12 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 30 Jul 2020 18:26:11 +0100
Subject: [PATCH] Move metrics to monitoring NS

---
 charts/kubezero/templates/metrics.yaml | 7 ++++++-
 deploy/templates/values.yaml           | 2 ++
 deploy/values.yaml                     | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/kubezero/templates/metrics.yaml b/charts/kubezero/templates/metrics.yaml
index 139a6098..59c7ee3c 100644
--- a/charts/kubezero/templates/metrics.yaml
+++ b/charts/kubezero/templates/metrics.yaml
@@ -1,6 +1,11 @@
 {{- if index .Values "metrics" "enabled" }}
-{{ template "kubezero-app.app" dict "root" . "name" "metrics" "type" "helm" }}
+{{ template "kubezero-app.app" dict "root" . "name" "metrics" "type" "helm" "namespace" "monitoring"}}
   syncPolicy:
     automated:
       prune: true
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring
 {{- end }}
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 2a71673a..b4621968 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -85,6 +85,8 @@ kubezero:
         {{- toYaml .Values.istio.ingress | nindent 8 }}
       {{- end }}
 
+  metrics:
+    enabled: {{ .Values.metrics.enabled }}
 {{- end }}
 
 argo-cd:
diff --git a/deploy/values.yaml b/deploy/values.yaml
index 0c00f1fd..4572d315 100644
--- a/deploy/values.yaml
+++ b/deploy/values.yaml
@@ -25,6 +25,10 @@ kiam:
 istio:
   enabled: false
 
+metrics:
+  enabled: false
+
+# Deprecated once metrics goes live
 prometheus:
   enabled: false