Add custom prometehus-operator settings

CHANGES.md

@@ -7,8 +7,9 @@
 
 # Kubezero
 - fully automated one command bootstrap incl. all kubezero components 
-- migrated from kube-prometheuss to community helm charts for metrics
+- migrated from kube-prometheuss to prometheus-operator helm charts for metrics
 - latest Grafana incl. peristence
 - kube-prometheus adapter improvements / customizations
 - integrated EFS CSI driver into Kubezero
 - prometheus itself can be exposed via istio ingress on demand to ease development of custom metrics
+- backup script to export all cert-manager items between clusters

charts/kubezero-metrics/values.yaml

@@ -13,8 +13,12 @@ prometheus:
 prometheus-operator:
   defaultRules:
     create: true
+
   coreDns:
     enabled: true
+  kubeDns:
+    enabled: false
+
   kubeApiServer:
     enabled: true
   kubeStateMetrics:
@@ -22,9 +26,7 @@ prometheus-operator:
   kubeProxy:
     enabled: true
 
-  # Disabled until we figure out how to scrape etcd with ssl client certs, scheduler/proxy/controller require https since 1.17
-  kubeDns:
-    enabled: false
+  # Disabled until we figure out how to scrape etcd with ssl client certs
   kubeEtcd:
     enabled: false
 

deploy/templates/values.yaml

@@ -116,6 +116,10 @@ kubezero:
           {{- toYaml . | nindent 10 }}
           {{- end }}
       {{- end }}
+      {{- if .Values.metrics.prometheus-operator }}
+      prometheus-operator:
+      {{- toYaml .Values.metrics.prometheus-operator | nindent 8 }}
+      {{- end }}
 
 argo-cd:
   {{- with index .Values "argo-cd" "server" }}