move kube-state-metrics monitor to kustomize base

cloudnativedaysjp · Apr 6, 2024 · e83e2c7 · e83e2c7
1 parent 5ddac2f
commit e83e2c7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/manifests/infra/prometheus/base/monitor.yaml b/manifests/infra/prometheus/base/monitor.yaml
@@ -76,6 +76,22 @@ spec:
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
+metadata:
+  name: kube-state-metrics
+  namespace: monitoring
+spec:
+  endpoints:
+    - path: /metrics
+      port: http
+  namespaceSelector:
+    matchNames:
+      - monitoring
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: kube-state-metrics
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
 metadata:
   name: argocd-repo-server
   namespace: monitoring

diff --git a/manifests/infra/prometheus/overlays/development/service-monitor-dk.yaml b/manifests/infra/prometheus/overlays/development/service-monitor-dk.yaml
@@ -7,20 +7,4 @@ spec:
   namespaceSelector:
     matchNames:
     - dreamkast-staging
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: kube-state-metrics
-  namespace: monitoring
-spec:
-  endpoints:
-    - path: /metrics
-      port: http
-  namespaceSelector:
-    matchNames:
-      - monitoring
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: kube-state-metrics