Have one podmonitor per shard

Issue: ZENKO-4641
scality · Jan 3, 2025 · 6e8d62e · 6e8d62e
1 parent 25d67b0
commit 6e8d62e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
@@ -4,7 +4,8 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{- if and .Values.shards .Values.metrics.enabled .Values.metrics.podMonitor.enabled }}
-{{- $i := 0 }}
+{{- $replicas := .Values.shards | int }}
+{{- range $i, $e := until $replicas }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
@@ -35,4 +36,9 @@ spec:
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: shardsvr
+      shard: {{ $i | quote }}
+{{- if lt $i (sub $replicas 1) }}
+---
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/solution-base/mongodb/patches/mongodb-sharded-fix-podmonitor.patch b/solution-base/mongodb/patches/mongodb-sharded-fix-podmonitor.patch
diff --git a/solution-base/mongodb/patches/shard-data-podmonitor.patch b/solution-base/mongodb/patches/shard-data-podmonitor.patch