Merge pull request kubernetes#2075 from oprinmarius/patch/control-pla…

…ne-tolerations Add control-plane toleration for Prometheus for Windows tests
Rei1010 · Jun 28, 2022 · 4dd3c06 · 4dd3c06
2 parents 277b865 + 0b20619
commit 4dd3c06
Show file tree

Hide file tree

Showing 2 changed files with 22 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,5 +1,6 @@
 {{$PROMETHEUS_SCRAPE_KUBELETS := DefaultParam .PROMETHEUS_SCRAPE_KUBELETS false}}
 {{$PROMETHEUS_NODE_SELECTOR := DefaultParam .CL2_PROMETHEUS_NODE_SELECTOR ""}}
+{{$PROMETHEUS_TOLERATE_MASTER := DefaultParam .CL2_PROMETHEUS_TOLERATE_MASTER false}}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -48,6 +49,15 @@ spec:
         securityContext:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
+      {{if $PROMETHEUS_TOLERATE_MASTER}}
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          operator: Exists
+          effect: NoSchedule
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+          effect: NoSchedule
+      {{end}}
       nodeSelector:
         kubernetes.io/os: linux
         {{$PROMETHEUS_NODE_SELECTOR}}

diff --git a/clusterloader2/pkg/prometheus/manifests/prometheus-prometheus.yaml b/clusterloader2/pkg/prometheus/manifests/prometheus-prometheus.yaml
@@ -4,6 +4,7 @@
 {{$PROMETHEUS_MEMORY_LIMIT_FACTOR := DefaultParam .CL2_PROMETHEUS_MEMORY_LIMIT_FACTOR 2}}
 {{$PROMETHEUS_MEMORY_SCALE_FACTOR := DefaultParam .CL2_PROMETHEUS_MEMORY_SCALE_FACTOR $PROMETHEUS_MEMORY_LIMIT_FACTOR}}
 {{$PROMETHEUS_NODE_SELECTOR := DefaultParam .CL2_PROMETHEUS_NODE_SELECTOR ""}}
+{{$PROMETHEUS_TOLERATE_MASTER := DefaultParam .CL2_PROMETHEUS_TOLERATE_MASTER false}}
 
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
@@ -47,13 +48,23 @@ spec:
   - key: "monitoring"
     operator: "Exists"
     effect: "NoSchedule"
+  {{if $PROMETHEUS_TOLERATE_MASTER}}
+  - key: node-role.kubernetes.io/master
+    operator: Exists
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/control-plane
+    operator: Exists
+    effect: NoSchedule
+  {{end}}
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
   podMonitorNamespaceSelector: {}
   podMonitorSelector: {}
   version: v2.25.0
   retention: 7d
+  {{if not $PROMETHEUS_TOLERATE_MASTER}}
+  # We add node tolerations for control-plane nodes in Azure Windows test jobs which do not support Google PD
   storage:
     volumeClaimTemplate:
       spec:
@@ -62,6 +73,7 @@ spec:
           requests:
             # Start with 10Gi, add 10Gi for each 1K nodes.
             storage: {{MultiplyInt 10 (AddInt 1 (DivideInt .Nodes 1000))}}Gi
+  {{ end }}
   query:
     maxSamples: 100000000
   {{if $PROMETHEUS_SCRAPE_WINDOWS_NODES}}