diff --git a/pkg/alertmanager/statefulset.go b/pkg/alertmanager/statefulset.go index 2d2ae3578c..037573d140 100644 --- a/pkg/alertmanager/statefulset.go +++ b/pkg/alertmanager/statefulset.go @@ -460,12 +460,6 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S MountPath: alertmanagerConfDir, }, }, - Resources: v1.ResourceRequirements{ - Limits: v1.ResourceList{ - v1.ResourceCPU: resource.MustParse("50m"), - v1.ResourceMemory: resource.MustParse("10Mi"), - }, - }, }, }, a.Spec.Containers...), Volumes: volumes, diff --git a/pkg/prometheus/statefulset.go b/pkg/prometheus/statefulset.go index 3f45acd317..52ed9a9d22 100644 --- a/pkg/prometheus/statefulset.go +++ b/pkg/prometheus/statefulset.go @@ -594,12 +594,6 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName fmt.Sprintf("--webhook-url=%s", localReloadURL), }, VolumeMounts: []v1.VolumeMount{}, - Resources: v1.ResourceRequirements{ - Limits: v1.ResourceList{ - v1.ResourceCPU: resource.MustParse("25m"), - v1.ResourceMemory: resource.MustParse("10Mi"), - }, - }, } for _, name := range ruleConfigMapNames { @@ -816,12 +810,6 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName Command: []string{"/bin/prometheus-config-reloader"}, Args: configReloadArgs, VolumeMounts: configReloadVolumeMounts, - Resources: v1.ResourceRequirements{ - Limits: v1.ResourceList{ - v1.ResourceCPU: resource.MustParse("50m"), - v1.ResourceMemory: resource.MustParse("50Mi"), - }, - }, }, }, additionalContainers...), SecurityContext: securityContext, @@ -829,9 +817,9 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName NodeSelector: p.Spec.NodeSelector, PriorityClassName: p.Spec.PriorityClassName, TerminationGracePeriodSeconds: &terminationGracePeriod, - Volumes: volumes, - Tolerations: p.Spec.Tolerations, - Affinity: p.Spec.Affinity, + Volumes: volumes, + Tolerations: p.Spec.Tolerations, + Affinity: p.Spec.Affinity, }, }, }, nil