Merge pull request #1577 from Brian-McM/auto-pick-of-#1576-upstream-r…

…elease-v1.22 [release-v1.22] Auto pick #1576: Add Tolerations to Prometheus CRs
tigera · Oct 19, 2021 · 851a90a · 851a90a
2 parents 08f2c86 + c4ad25f
commit 851a90a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/render/monitor.go b/pkg/render/monitor.go
@@ -138,6 +138,8 @@ func (mc *monitorComponent) alertmanager() *monitoringv1.Alertmanager {
 			ImagePullSecrets: secret.GetReferenceList(mc.pullSecrets),
 			Replicas:         ptr.Int32ToPtr(3),
 			Version:          components.ComponentPrometheusAlertmanager.Version,
+			Tolerations:      mc.installation.ControlPlaneTolerations,
+			NodeSelector:     mc.installation.ControlPlaneNodeSelector,
 		},
 	}
 }
@@ -162,6 +164,8 @@ func (mc *monitorComponent) prometheus() *monitoringv1.Prometheus {
 				"prometheus": CalicoNodePrometheus,
 				"role":       "tigera-prometheus-rules",
 			}},
+			Tolerations:  mc.installation.ControlPlaneTolerations,
+			NodeSelector: mc.installation.ControlPlaneNodeSelector,
 			Alerting: &monitoringv1.AlertingSpec{
 				Alertmanagers: []monitoringv1.AlertmanagerEndpoints{
 					{