Skip to content

Commit 2534697

Browse files
committed
Refactor namespace selector handling in target allocator
1 parent f4d868f commit 2534697

File tree

4 files changed

+83
-43
lines changed

4 files changed

+83
-43
lines changed

cmd/otel-allocator/internal/config/config.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,11 @@ func CreateDefaultConfig() Config {
290290
AllocationFallbackStrategy: "",
291291
FilterStrategy: DefaultFilterStrategy,
292292
PrometheusCR: PrometheusCRConfig{
293-
ScrapeInterval: DefaultCRScrapeInterval,
293+
ScrapeInterval: DefaultCRScrapeInterval,
294+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
295+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
296+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
297+
ProbeNamespaceSelector: &metav1.LabelSelector{},
294298
},
295299
}
296300
}

cmd/otel-allocator/internal/config/config_test.go

+26-6
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@ func TestLoad(t *testing.T) {
5151
},
5252
FilterStrategy: DefaultFilterStrategy,
5353
PrometheusCR: PrometheusCRConfig{
54-
Enabled: true,
55-
ScrapeInterval: model.Duration(time.Second * 60),
54+
Enabled: true,
55+
ScrapeInterval: model.Duration(time.Second * 60),
56+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
57+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
58+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
59+
ProbeNamespaceSelector: &metav1.LabelSelector{},
5660
},
5761
HTTPS: HTTPSServerConfig{
5862
Enabled: true,
@@ -142,7 +146,11 @@ func TestLoad(t *testing.T) {
142146
"release": "test",
143147
},
144148
},
145-
ScrapeInterval: DefaultCRScrapeInterval,
149+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
150+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
151+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
152+
ProbeNamespaceSelector: &metav1.LabelSelector{},
153+
ScrapeInterval: DefaultCRScrapeInterval,
146154
},
147155
PromConfig: &promconfig.Config{
148156
GlobalConfig: promconfig.GlobalConfig{
@@ -213,7 +221,11 @@ func TestLoad(t *testing.T) {
213221
"release": "test",
214222
},
215223
},
216-
ScrapeInterval: DefaultCRScrapeInterval,
224+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
225+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
226+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
227+
ProbeNamespaceSelector: &metav1.LabelSelector{},
228+
ScrapeInterval: DefaultCRScrapeInterval,
217229
},
218230
PromConfig: &promconfig.Config{
219231
GlobalConfig: promconfig.GlobalConfig{
@@ -308,7 +320,11 @@ func TestLoad(t *testing.T) {
308320
},
309321
},
310322
},
311-
ScrapeInterval: DefaultCRScrapeInterval,
323+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
324+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
325+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
326+
ProbeNamespaceSelector: &metav1.LabelSelector{},
327+
ScrapeInterval: DefaultCRScrapeInterval,
312328
},
313329
PromConfig: &promconfig.Config{
314330
GlobalConfig: promconfig.GlobalConfig{
@@ -403,7 +419,11 @@ func TestLoad(t *testing.T) {
403419
},
404420
},
405421
},
406-
ScrapeInterval: DefaultCRScrapeInterval,
422+
ServiceMonitorNamespaceSelector: &metav1.LabelSelector{},
423+
PodMonitorNamespaceSelector: &metav1.LabelSelector{},
424+
ScrapeConfigNamespaceSelector: &metav1.LabelSelector{},
425+
ProbeNamespaceSelector: &metav1.LabelSelector{},
426+
ScrapeInterval: DefaultCRScrapeInterval,
407427
},
408428
PromConfig: &promconfig.Config{
409429
GlobalConfig: promconfig.GlobalConfig{

cmd/otel-allocator/internal/watcher/promOperator.go

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
6565

6666
// TODO: We should make these durations configurable
6767
prom := &monitoringv1.Prometheus{
68+
ObjectMeta: metav1.ObjectMeta{
69+
Namespace: cfg.CollectorNamespace,
70+
},
6871
Spec: monitoringv1.PrometheusSpec{
6972
CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
7073
ScrapeInterval: monitoringv1.Duration(cfg.PrometheusCR.ScrapeInterval.String()),

0 commit comments

Comments
 (0)