Add Prometheus & Alertmanager to StatefulSet connections (#243)

Signed-off-by: Tamal Saha <[email protected]>
kubeops · Sep 18, 2023 · 734ed6b · 734ed6b
1 parent e692dbb
commit 734ed6b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	kmodules.xyz/custom-resources v0.25.1
 	kmodules.xyz/go-containerregistry v0.0.11
 	kmodules.xyz/monitoring-agent-api v0.25.1
-	kmodules.xyz/resource-metadata v0.17.18-0.20230915005256-94f8e1aecba0
+	kmodules.xyz/resource-metadata v0.17.18-0.20230918033236-e1c249adc4c7
 	kmodules.xyz/resource-metrics v0.25.2
 	kmodules.xyz/sets v0.25.0
 	kubeops.dev/scanner v0.0.13-0.20230610152531-83d060ed8780

diff --git a/go.sum b/go.sum
@@ -2126,8 +2126,8 @@ kmodules.xyz/monitoring-agent-api v0.25.1 h1:E1H8U/vMfYQ8wevmJv6Lcj0Z4DF7cH3hZ2x
 kmodules.xyz/monitoring-agent-api v0.25.1/go.mod h1:IphGzRWbuV00B3TLalcBs6+IlchSZVTwKDty+J3LLz4=
 kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI=
 kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo=
-kmodules.xyz/resource-metadata v0.17.18-0.20230915005256-94f8e1aecba0 h1:V1+S1+UPpsOV8FJGGuIQOt4ok59YV/AQSCu8nq6UjmQ=
-kmodules.xyz/resource-metadata v0.17.18-0.20230915005256-94f8e1aecba0/go.mod h1:1MUXA2EdOiIjBuulR0IEsFjgf8AtSL2BZlXpvoUPJvs=
+kmodules.xyz/resource-metadata v0.17.18-0.20230918033236-e1c249adc4c7 h1:eDYL6+sBHrx6Lsrq2CvdSn0QXM/BhLbFB/b2eO/7sY4=
+kmodules.xyz/resource-metadata v0.17.18-0.20230918033236-e1c249adc4c7/go.mod h1:1MUXA2EdOiIjBuulR0IEsFjgf8AtSL2BZlXpvoUPJvs=
 kmodules.xyz/resource-metrics v0.25.2 h1:BwCb6qyunvQBa0u8UUkw+wYG5/T4qtNtAKcHjSsk0JU=
 kmodules.xyz/resource-metrics v0.25.2/go.mod h1:ZK/52NLuwMk+Jt0bmUtGQHtSxPLYYpsFILG7SJhYPg0=
 kmodules.xyz/sets v0.25.0 h1:belY/3trp/M/CKc1TEteA40jb2uCIdwKHhjpvrIxG+8=

diff --git a/...ource-metadata/hub/resourceblockdefinitions/monitoring.coreos.com/v1/apps-monitoring.yaml b/...ource-metadata/hub/resourceblockdefinitions/monitoring.coreos.com/v1/apps-monitoring.yaml
@@ -62,11 +62,9 @@ spec:
                 name
               }
             }
-            pods: offshoot(group: "", kind: "Pod") {
-              refs: monitored_by(group: $targetGroup, kind: $targetKind) {
-                namespace
-                name
-              }
+            refs: monitored_by(group: $targetGroup, kind: $targetKind) {
+              namespace
+              name
             }
           }
         }

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/apps/v1/statefulsets.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/apps/v1/statefulsets.yaml
@@ -20,6 +20,20 @@ spec:
       apiVersion: v1
       kind: Pod
     type: MatchSelector
+  - labels:
+    - offshoot
+    level: Controller
+    target:
+      apiVersion: monitoring.coreos.com/v1
+      kind: Alertmanager
+    type: OwnedBy
+  - labels:
+    - offshoot
+    level: Controller
+    target:
+      apiVersion: monitoring.coreos.com/v1
+      kind: Prometheus
+    type: OwnedBy
   resource:
     group: apps
     kind: StatefulSet

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1790,7 +1790,7 @@ kmodules.xyz/monitoring-agent-api/client
 # kmodules.xyz/offshoot-api v0.25.0
 ## explicit; go 1.18
 kmodules.xyz/offshoot-api/api/v1
-# kmodules.xyz/resource-metadata v0.17.18-0.20230915005256-94f8e1aecba0
+# kmodules.xyz/resource-metadata v0.17.18-0.20230918033236-e1c249adc4c7
 ## explicit; go 1.18
 kmodules.xyz/resource-metadata/apis/core/install
 kmodules.xyz/resource-metadata/apis/core/v1alpha1