Removes control-plane affinity from Prometheus (#1625)

giantswarm · May 23, 2024 · 4947e28 · 4947e28
1 parent 78a50d1
commit 4947e28
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 128 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
 ### Changed
 
 - Remove prometheus remote write agent configuration when mimir is enabled.
+- Remove unnecessary prometheus control-plane affinity.
 
 ## [4.75.0] - 2024-05-13
 

diff --git a/service/controller/resource/monitoring/prometheus/resource.go b/service/controller/resource/monitoring/prometheus/resource.go
@@ -164,22 +164,6 @@ func toPrometheus(ctx context.Context, v interface{}, config Config) (metav1.Obj
 					},
 					Key: key.PrometheusAdditionalScrapeConfigsName(),
 				},
-				Affinity: &corev1.Affinity{
-					NodeAffinity: &corev1.NodeAffinity{
-						RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
-							NodeSelectorTerms: []corev1.NodeSelectorTerm{
-								{
-									MatchExpressions: []corev1.NodeSelectorRequirement{
-										{
-											Key:      "node-role.kubernetes.io/control-plane",
-											Operator: corev1.NodeSelectorOpDoesNotExist,
-										},
-									},
-								},
-							},
-						},
-					},
-				},
 				EnableRemoteWriteReceiver: true,
 				ExternalLabels: map[string]string{
 					key.ClusterIDKey:    key.ClusterID(cluster),

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/capi/case-1-capa-mc.golden b/service/controller/resource/monitoring/prometheus/test/classic/capi/case-1-capa-mc.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/capi/case-2-capa.golden b/service/controller/resource/monitoring/prometheus/test/classic/capi/case-2-capa.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/capi/case-3-capz.golden b/service/controller/resource/monitoring/prometheus/test/classic/capi/case-3-capz.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/capi/case-4-eks.golden b/service/controller/resource/monitoring/prometheus/test/classic/capi/case-4-eks.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/capi/case-5-gcp.golden b/service/controller/resource/monitoring/prometheus/test/classic/capi/case-5-gcp.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/...e/controller/resource/monitoring/prometheus/test/classic/vintage/case-1-vintage-mc.golden b/...e/controller/resource/monitoring/prometheus/test/classic/vintage/case-1-vintage-mc.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/vintage/case-2-aws-v16.golden b/service/controller/resource/monitoring/prometheus/test/classic/vintage/case-2-aws-v16.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/classic/vintage/case-3-aws-v18.golden b/service/controller/resource/monitoring/prometheus/test/classic/vintage/case-3-aws-v18.golden
@@ -14,13 +14,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/...e/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-1-capa-mc.golden b/...e/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-1-capa-mc.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-2-capa.golden b/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-2-capa.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-3-capz.golden b/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-3-capz.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-4-eks.golden b/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-4-eks.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-5-gcp.golden b/service/controller/resource/monitoring/prometheus/test/mimir-enabled/capi/case-5-gcp.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/...roller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-1-vintage-mc.golden b/...roller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-1-vintage-mc.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/...ontroller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-2-aws-v16.golden b/...ontroller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-2-aws-v16.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token

diff --git a/...ontroller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-3-aws-v18.golden b/...ontroller/resource/monitoring/prometheus/test/mimir-enabled/vintage/case-3-aws-v18.golden
@@ -11,13 +11,6 @@ spec:
   additionalScrapeConfigs:
     key: prometheus-additional.yaml
     name: additional-scrape-configs
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-role.kubernetes.io/control-plane
-            operator: DoesNotExist
   apiserverConfig:
     authorization:
       credentialsFile: /etc/prometheus/secrets/cluster-certificates/token