From bdb3a09c2b2b663578085b2e6aa90889ab994543 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sun, 4 Feb 2024 15:49:43 +0930
Subject: [PATCH] feat(kube_monitor_proxy): don't deploy if not enabled

!8
---
 templates/ClusterRole-kube-monitor-proxy.yaml        |  3 +++
 templates/Daemonset-kube-monitor-proxy.yaml          |  3 +++
 templates/PrometheusRule-kubePrometheus.yaml         |  3 +++
 templates/PrometheusRule-kubernetesControlPlane.yaml |  3 +++
 templates/Service-kube-monitor-proxy.yaml            |  3 +++
 templates/ServiceAccount-kube-monitor-proxy.yaml     |  3 +++
 .../ServiceMonitor-kube-controller-manager.yaml      |  4 +++-
 templates/ServiceMonitor-kube-scheduler.yaml         |  4 +++-
 values.yaml                                          | 12 ++++++++++++
 9 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/templates/ClusterRole-kube-monitor-proxy.yaml b/templates/ClusterRole-kube-monitor-proxy.yaml
index e7b364a..b13a9dc 100644
--- a/templates/ClusterRole-kube-monitor-proxy.yaml
+++ b/templates/ClusterRole-kube-monitor-proxy.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -19,3 +20,5 @@ rules:
   resources:
   - subjectaccessreviews
   verbs: ["create"]
+
+{{ end }}
\ No newline at end of file
diff --git a/templates/Daemonset-kube-monitor-proxy.yaml b/templates/Daemonset-kube-monitor-proxy.yaml
index a283196..823f029 100644
--- a/templates/Daemonset-kube-monitor-proxy.yaml
+++ b/templates/Daemonset-kube-monitor-proxy.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -134,3 +135,5 @@ spec:
       serviceAccountName: kube-monitor-proxy
       tolerations:
       - operator: Exists
+
+{{ end }}
diff --git a/templates/PrometheusRule-kubePrometheus.yaml b/templates/PrometheusRule-kubePrometheus.yaml
index 268491b..bce1d09 100644
--- a/templates/PrometheusRule-kubePrometheus.yaml
+++ b/templates/PrometheusRule-kubePrometheus.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -84,3 +85,5 @@ spec:
       record: count:up1
     - expr: count without(instance, pod, node) (up == 0)
       record: count:up0
+
+{{ end }}
\ No newline at end of file
diff --git a/templates/PrometheusRule-kubernetesControlPlane.yaml b/templates/PrometheusRule-kubernetesControlPlane.yaml
index 6845600..b55c8d2 100644
--- a/templates/PrometheusRule-kubernetesControlPlane.yaml
+++ b/templates/PrometheusRule-kubernetesControlPlane.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -1439,3 +1440,5 @@ spec:
       labels:
         quantile: "0.5"
       record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
+
+{{ end }}
\ No newline at end of file
diff --git a/templates/Service-kube-monitor-proxy.yaml b/templates/Service-kube-monitor-proxy.yaml
index a23d9dd..a3d4f75 100644
--- a/templates/Service-kube-monitor-proxy.yaml
+++ b/templates/Service-kube-monitor-proxy.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,3 +29,5 @@ spec:
       port: 10259
       targetPort: kube-scheduler
   sessionAffinity: ClientIP
+
+{{ end }}
diff --git a/templates/ServiceAccount-kube-monitor-proxy.yaml b/templates/ServiceAccount-kube-monitor-proxy.yaml
index b8e258f..944508b 100644
--- a/templates/ServiceAccount-kube-monitor-proxy.yaml
+++ b/templates/ServiceAccount-kube-monitor-proxy.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -11,3 +12,5 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
+
+{{ end }}
\ No newline at end of file
diff --git a/templates/ServiceMonitor-kube-controller-manager.yaml b/templates/ServiceMonitor-kube-controller-manager.yaml
index 130eccc..9b1b571 100644
--- a/templates/ServiceMonitor-kube-controller-manager.yaml
+++ b/templates/ServiceMonitor-kube-controller-manager.yaml
@@ -1,4 +1,5 @@
 {{ if .Values.nfc_monitoring.prometheus.service_monitor.kube_controller_manager }}
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -82,4 +83,5 @@ spec:
       app.kubernetes.io/name: kube-monitor-proxy
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
-{{ end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
diff --git a/templates/ServiceMonitor-kube-scheduler.yaml b/templates/ServiceMonitor-kube-scheduler.yaml
index f51a1ab..76005fe 100644
--- a/templates/ServiceMonitor-kube-scheduler.yaml
+++ b/templates/ServiceMonitor-kube-scheduler.yaml
@@ -1,4 +1,5 @@
 {{ if .Values.nfc_monitoring.prometheus.service_monitor.kube_scheduler }}
+{{ if .Values.nfc_monitoring.kube_monitor_proxy.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -36,4 +37,5 @@ spec:
       app.kubernetes.io/name: kube-monitor-proxy
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
-{{ end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
diff --git a/values.yaml b/values.yaml
index 90a8885..8bca6ce 100644
--- a/values.yaml
+++ b/values.yaml
@@ -241,10 +241,12 @@ nfc_monitoring:
 
 
   kube_monitor_proxy:
+    enabled: false
     namespace: monitoring
 
 
   kube_rbac_proxy:
+
     # This image is used as part of kube-monitor-proxy.
     image: 
       name: quay.io/brancz/kube-rbac-proxy
@@ -387,6 +389,16 @@ nfc_monitoring:
         matchLabels:
           role: alert-rules
 
+    service_monitors:
+      apiserver: false
+      cadvisor: false
+      calico: false
+      ceph: false
+      coredns: false
+      kube_controller_manager: false
+      kubelet: false
+      kube_scheduler: false
+
 
   prometheus_adaptor: