Merge pull request kubernetes#2084 from jprzychodzen/prom-nodeselector

Add custom nodeSelector for Prometheus
Rei1010 · Jun 9, 2022 · 3658d94 · 3658d94
2 parents 378cf33 + d1e70bb
commit 3658d94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/clusterloader2/pkg/prometheus/manifests/0prometheus-operator-deployment.yaml b/clusterloader2/pkg/prometheus/manifests/0prometheus-operator-deployment.yaml
@@ -1,4 +1,5 @@
 {{$PROMETHEUS_SCRAPE_KUBELETS := DefaultParam .PROMETHEUS_SCRAPE_KUBELETS false}}
+{{$PROMETHEUS_NODE_SELECTOR := DefaultParam .CL2_PROMETHEUS_NODE_SELECTOR ""}}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -49,6 +50,7 @@ spec:
           readOnlyRootFilesystem: true
       nodeSelector:
         kubernetes.io/os: linux
+        {{$PROMETHEUS_NODE_SELECTOR}}
       securityContext:
         runAsNonRoot: true
         runAsUser: 65534

diff --git a/clusterloader2/pkg/prometheus/manifests/prometheus-prometheus.yaml b/clusterloader2/pkg/prometheus/manifests/prometheus-prometheus.yaml
@@ -1,6 +1,7 @@
 {{$PROMETHEUS_SCRAPE_KUBELETS := DefaultParam .PROMETHEUS_SCRAPE_KUBELETS false}}
 {{$PROMETHEUS_SCRAPE_WINDOWS_NODES := DefaultParam .PROMETHEUS_SCRAPE_WINDOWS_NODES false}}
 {{$PROMETHEUS_MEMORY_LIMIT_FACTOR := DefaultParam .CL2_PROMETHEUS_MEMORY_LIMIT_FACTOR 2}}
+{{$PROMETHEUS_NODE_SELECTOR := DefaultParam .CL2_PROMETHEUS_NODE_SELECTOR ""}}
 
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
@@ -15,6 +16,7 @@ spec:
   baseImage: gcr.io/k8s-testimages/quay.io/prometheus/prometheus
   nodeSelector:
     kubernetes.io/os: linux
+    {{$PROMETHEUS_NODE_SELECTOR}}
   replicas: 1
   resources:
     requests: