Always set shards to 1 for all created Prometheuses (#1494)

Co-authored-by: Herve Nicol <[email protected]>
giantswarm · Jan 30, 2024 · 4c6457b · 4c6457b
1 parent cde5846
commit 4c6457b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add `CiliumNetworkPolicy` for all created Prometheuses.
+- Always set `shards` to 1 for all created Prometheuses.
 
 ## [4.64.0] - 2024-01-19
 

diff --git a/service/controller/resource/monitoring/prometheus/resource.go b/service/controller/resource/monitoring/prometheus/resource.go
@@ -115,6 +115,7 @@ func toPrometheus(ctx context.Context, v interface{}, config Config) (metav1.Obj
 	// Prometheus default image runs using the nobody user (65534)
 	var gid int64 = 65534
 	var walCompression bool = true
+	var prometheusShards int32 = 1
 
 	annotationValue := cluster.GetAnnotations()[key.PrometheusVolumeSizeAnnotation]
 	volumeSize := pvcresizing.PrometheusVolumeSize(annotationValue)
@@ -229,6 +230,7 @@ func toPrometheus(ctx context.Context, v interface{}, config Config) (metav1.Obj
 						Type: corev1.SeccompProfileTypeRuntimeDefault,
 					},
 				},
+				Shards:  &prometheusShards,
 				Storage: &storage,
 				TopologySpreadConstraints: []corev1.TopologySpreadConstraint{
 					{

diff --git a/service/controller/resource/monitoring/prometheus/test/case-1-vintage-mc.golden b/service/controller/resource/monitoring/prometheus/test/case-1-vintage-mc.golden
@@ -98,6 +98,7 @@ spec:
     matchExpressions:
     - key: application.giantswarm.io/team
       operator: DoesNotExist
+  shards: 1
   storage:
     volumeClaimTemplate:
       metadata: {}

diff --git a/service/controller/resource/monitoring/prometheus/test/case-2-aws-v16.golden b/service/controller/resource/monitoring/prometheus/test/case-2-aws-v16.golden
@@ -95,6 +95,7 @@ spec:
     matchExpressions:
     - key: nonexistentkey
       operator: Exists
+  shards: 1
   storage:
     volumeClaimTemplate:
       metadata: {}

diff --git a/service/controller/resource/monitoring/prometheus/test/case-3-aws-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-3-aws-v18.golden
@@ -95,6 +95,7 @@ spec:
     matchExpressions:
     - key: nonexistentkey
       operator: Exists
+  shards: 1
   storage:
     volumeClaimTemplate:
       metadata: {}

diff --git a/service/controller/resource/monitoring/prometheus/test/case-4-azure-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-4-azure-v18.golden
@@ -95,6 +95,7 @@ spec:
     matchExpressions:
     - key: nonexistentkey
       operator: Exists
+  shards: 1
   storage:
     volumeClaimTemplate:
       metadata: {}

diff --git a/service/controller/resource/monitoring/prometheus/test/case-5-eks-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-5-eks-v18.golden
@@ -95,6 +95,7 @@ spec:
     matchExpressions:
     - key: nonexistentkey
       operator: Exists
+  shards: 1
   storage:
     volumeClaimTemplate:
       metadata: {}