Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func newAlertmanager(
Labels: podLabels("alertmanager", ms.Name),
},
Replicas: ms.Spec.AlertmanagerConfig.Replicas,
Resources: ms.Spec.Resources,
ServiceAccountName: rbacResourceName,
AlertmanagerConfigSelector: resourceSelector,
NodeSelector: ms.Spec.NodeSelector,
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/monitoring/monitoring-stack/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ func newPrometheus(
RuleSelector: prometheusSelector,
RuleNamespaceSelector: ms.Spec.NamespaceSelector,
Thanos: &monv1.ThanosSpec{
Image: ptr.To(thanosCfg.Image),
Image: ptr.To(thanosCfg.Image),
Resources: ms.Spec.Resources,
},
},
}
Expand Down
57 changes: 57 additions & 0 deletions pkg/controllers/monitoring/monitoring-stack/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,63 @@ func TestStorageSpec(t *testing.T) {
}
}

func TestNewAlertmanagerSetsResources(t *testing.T) {
resources := corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("100m"),
corev1.ResourceMemory: resource.MustParse("256Mi"),
},
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("500m"),
corev1.ResourceMemory: resource.MustParse("512Mi"),
},
}
ms := &stack.MonitoringStack{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
Namespace: "ns",
},
Spec: stack.MonitoringStackSpec{
Resources: resources,
AlertmanagerConfig: stack.AlertmanagerConfig{},
},
}

am := newAlertmanager(ms, "test-alertmanager", AlertmanagerConfiguration{})
assert.DeepEqual(t, resources, am.Spec.Resources)
}

func TestNewPrometheusSetsThanosSidecarResources(t *testing.T) {
resources := corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("100m"),
corev1.ResourceMemory: resource.MustParse("256Mi"),
},
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("500m"),
corev1.ResourceMemory: resource.MustParse("512Mi"),
},
}
ms := &stack.MonitoringStack{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
Namespace: "ns",
},
Spec: stack.MonitoringStackSpec{
Resources: resources,
PrometheusConfig: &stack.PrometheusConfig{},
AlertmanagerConfig: stack.AlertmanagerConfig{Disabled: true},
},
}

prom := newPrometheus(ms, "test-prometheus", "test-scrape",
ThanosConfiguration{Image: "thanos:latest"},
PrometheusConfiguration{})

assert.DeepEqual(t, resources, prom.Spec.Thanos.Resources)
assert.DeepEqual(t, resources, prom.Spec.Resources)
}

func TestNewAdditionalScrapeConfigsSecret(t *testing.T) {
for _, tc := range []struct {
name string
Expand Down
Loading