Merge pull request #77 from fedepaol/helmfixes

Charts: disable service monitors by default

Makefile

@@ -169,7 +169,7 @@ deploy-helm: helm deploy-cluster deploy-prometheus
 	$(KUBECTL) create ns ${NAMESPACE} || true
 	$(KUBECTL) label ns ${NAMESPACE} pod-security.kubernetes.io/enforce=privileged
 	$(HELM) install frrk8s charts/frr-k8s/ --set frrk8s.image.tag=${IMG_TAG} --set frrk8s.logLevel=debug --set prometheus.rbacPrometheus=true \
-	--set prometheus.serviceAccount=prometheus-k8s --set prometheus.namespace=monitoring --namespace ${NAMESPACE}
+	--set prometheus.serviceAccount=prometheus-k8s --set prometheus.namespace=monitoring --set prometheus.serviceMonitor.enabled=true --namespace ${NAMESPACE}
 	sleep 2s # wait for daemonset to be created
 	$(KUBECTL) -n frr-k8s-system wait --for=condition=Ready --all pods --timeout 300s
 

charts/frr-k8s/README.md

@@ -81,7 +81,7 @@ Kubernetes: `>= 1.19.0-0`
 | prometheus.serviceAccount | string | `""` |  |
 | prometheus.serviceMonitor.additionalLabels | object | `{}` |  |
 | prometheus.serviceMonitor.annotations | object | `{}` |  |
-| prometheus.serviceMonitor.enabled | bool | `true` |  |
+| prometheus.serviceMonitor.enabled | bool | `false` |  |
 | prometheus.serviceMonitor.interval | string | `nil` |  |
 | prometheus.serviceMonitor.jobLabel | string | `"app.kubernetes.io/name"` |  |
 | prometheus.serviceMonitor.metricRelabelings | list | `[]` |  |

charts/frr-k8s/values.yaml

@@ -55,7 +55,7 @@ prometheus:
   # Prometheus Operator ServiceMonitors.
   serviceMonitor:
     # enable support for Prometheus Operator
-    enabled: true
+    enabled: false
 
     additionalLabels: {}
     # optional additional annotations for the controller serviceMonitor
@@ -86,35 +86,6 @@ prometheus:
     #   replacement: $1
     #   action: replace
 
-#  # Prometheus Operator alertmanager alerts
-#  prometheusRule:
-#    # enable alertmanager alerts
-#    enabled: false
-#
-#    # optional additionnal labels for prometheusRules
-#    additionalLabels: {}
-#
-#    # optional annotations for prometheusRules
-#    annotations: {}
-#
-#
-#    addressPoolUsage:
-#      enabled: true
-#      thresholds:
-#        - percent: 75
-#          labels:
-#            severity: warning
-#        - percent: 85
-#          labels:
-#            severity: warning
-#        - percent: 95
-#          labels:
-#            severity: alert
-#
-#
-#    extraAlerts: []
-
-
 # controller contains configuration specific to the FRRK8s controller
 # daemonset.
 frrk8s: