From beaa4f48963fc4765a443267414b932284a809a3 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 4 Feb 2024 17:33:16 +0930 Subject: [PATCH] fix(calico): use the operator created ns for monitoring !8 --- templates/Service-CalicoMetrics.yaml | 2 +- templates/ServiceMonitor-Calico.yaml | 2 +- values.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/Service-CalicoMetrics.yaml b/templates/Service-CalicoMetrics.yaml index e81c30b..ba7aa02 100644 --- a/templates/Service-CalicoMetrics.yaml +++ b/templates/Service-CalicoMetrics.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: name: calico-metrics - namespace: kube-system + namespace: calico-system labels: k8s-app: calico-node spec: diff --git a/templates/ServiceMonitor-Calico.yaml b/templates/ServiceMonitor-Calico.yaml index a3e5da4..28c535f 100644 --- a/templates/ServiceMonitor-Calico.yaml +++ b/templates/ServiceMonitor-Calico.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} k8s-app: calico-node name: calico - namespace: kube-system + namespace: calico-system spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/values.yaml b/values.yaml index 0aeb57b..623f854 100644 --- a/values.yaml +++ b/values.yaml @@ -310,6 +310,7 @@ nfc_monitoring: monitor_namespaces: - alerting - default + - calico-system # - ceph #- grafana - monitoring