diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go
index 8d2402a809..33e4acfa52 100644
--- a/apis/v1beta1/zz_generated.deepcopy.go
+++ b/apis/v1beta1/zz_generated.deepcopy.go
@@ -782,21 +782,41 @@ func (in *TargetAllocatorPrometheusCR) DeepCopyInto(out *TargetAllocatorPromethe
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
+ if in.PodMonitorNamespaceSelector != nil {
+ in, out := &in.PodMonitorNamespaceSelector, &out.PodMonitorNamespaceSelector
+ *out = new(metav1.LabelSelector)
+ (*in).DeepCopyInto(*out)
+ }
if in.ServiceMonitorSelector != nil {
in, out := &in.ServiceMonitorSelector, &out.ServiceMonitorSelector
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
+ if in.ServiceMonitorNamespaceSelector != nil {
+ in, out := &in.ServiceMonitorNamespaceSelector, &out.ServiceMonitorNamespaceSelector
+ *out = new(metav1.LabelSelector)
+ (*in).DeepCopyInto(*out)
+ }
if in.ScrapeConfigSelector != nil {
in, out := &in.ScrapeConfigSelector, &out.ScrapeConfigSelector
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
+ if in.ScrapeConfigNamespaceSelector != nil {
+ in, out := &in.ScrapeConfigNamespaceSelector, &out.ScrapeConfigNamespaceSelector
+ *out = new(metav1.LabelSelector)
+ (*in).DeepCopyInto(*out)
+ }
if in.ProbeSelector != nil {
in, out := &in.ProbeSelector, &out.ProbeSelector
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
+ if in.ProbeNamespaceSelector != nil {
+ in, out := &in.ProbeNamespaceSelector, &out.ProbeNamespaceSelector
+ *out = new(metav1.LabelSelector)
+ (*in).DeepCopyInto(*out)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TargetAllocatorPrometheusCR.
diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
index 3086cedb57..02df421157 100644
--- a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,7 +99,7 @@ metadata:
categories: Logging & Tracing,Monitoring
certified: "false"
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
- createdAt: "2024-12-19T16:56:26Z"
+ createdAt: "2024-12-28T16:14:39Z"
description: Provides the OpenTelemetry components, including the Collector
operators.operatorframework.io/builder: operator-sdk-v1.29.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
diff --git a/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml
index 54034ecd2e..6ea9b99317 100644
--- a/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -7883,6 +7883,33 @@ spec:
properties:
enabled:
type: boolean
+ podMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
podMonitorSelector:
properties:
matchExpressions:
@@ -7909,6 +7936,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ probeNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
probeSelector:
properties:
matchExpressions:
@@ -7935,6 +7989,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeConfigNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
scrapeConfigSelector:
properties:
matchExpressions:
@@ -7965,6 +8046,33 @@ spec:
default: 30s
format: duration
type: string
+ serviceMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
serviceMonitorSelector:
properties:
matchExpressions:
diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
index ed82b5b7eb..bcc99001b3 100644
--- a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,7 +99,7 @@ metadata:
categories: Logging & Tracing,Monitoring
certified: "false"
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
- createdAt: "2024-12-19T16:56:38Z"
+ createdAt: "2024-12-28T16:14:44Z"
description: Provides the OpenTelemetry components, including the Collector
operators.operatorframework.io/builder: operator-sdk-v1.29.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
diff --git a/bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml
index 54034ecd2e..6ea9b99317 100644
--- a/bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -7883,6 +7883,33 @@ spec:
properties:
enabled:
type: boolean
+ podMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
podMonitorSelector:
properties:
matchExpressions:
@@ -7909,6 +7936,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ probeNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
probeSelector:
properties:
matchExpressions:
@@ -7935,6 +7989,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeConfigNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
scrapeConfigSelector:
properties:
matchExpressions:
@@ -7965,6 +8046,33 @@ spec:
default: 30s
format: duration
type: string
+ serviceMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
serviceMonitorSelector:
properties:
matchExpressions:
diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
index 9142b75a58..e82f0a31ce 100644
--- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -7869,6 +7869,33 @@ spec:
properties:
enabled:
type: boolean
+ podMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
podMonitorSelector:
properties:
matchExpressions:
@@ -7895,6 +7922,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ probeNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
probeSelector:
properties:
matchExpressions:
@@ -7921,6 +7975,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeConfigNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
scrapeConfigSelector:
properties:
matchExpressions:
@@ -7951,6 +8032,33 @@ spec:
default: 30s
format: duration
type: string
+ serviceMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
serviceMonitorSelector:
properties:
matchExpressions:
diff --git a/config/crd/bases/opentelemetry.io_targetallocators.yaml b/config/crd/bases/opentelemetry.io_targetallocators.yaml
index 30e5c5c721..ce63cd0702 100644
--- a/config/crd/bases/opentelemetry.io_targetallocators.yaml
+++ b/config/crd/bases/opentelemetry.io_targetallocators.yaml
@@ -2243,6 +2243,33 @@ spec:
properties:
enabled:
type: boolean
+ podMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
podMonitorSelector:
properties:
matchExpressions:
@@ -2269,6 +2296,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ probeNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
probeSelector:
properties:
matchExpressions:
@@ -2295,6 +2349,33 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeConfigNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
scrapeConfigSelector:
properties:
matchExpressions:
@@ -2325,6 +2406,33 @@ spec:
default: 30s
format: duration
type: string
+ serviceMonitorNamespaceSelector:
+ default: {}
+ properties:
+ matchExpressions:
+ items:
+ properties:
+ key:
+ type: string
+ operator:
+ type: string
+ values:
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ x-kubernetes-list-type: atomic
+ matchLabels:
+ additionalProperties:
+ type: string
+ type: object
+ type: object
+ x-kubernetes-map-type: atomic
serviceMonitorSelector:
properties:
matchExpressions:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 372a75ae43..40c0846afa 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,3 +1,7 @@
resources:
- manager.yaml
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+ newName: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
diff --git a/controllers/builder_test.go b/controllers/builder_test.go
index 2dadd3fe52..1ee6f4e429 100644
--- a/controllers/builder_test.go
+++ b/controllers/builder_test.go
@@ -1518,7 +1518,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -1982,7 +1981,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -2491,7 +2489,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -3565,7 +3562,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -3845,7 +3841,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -4175,7 +4170,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
@@ -4479,7 +4473,6 @@ prometheus_cr:
probe_selector: null
scrape_config_namespace_selector: null
scrape_config_selector: null
- scrape_interval: 30s
service_monitor_namespace_selector: null
service_monitor_selector: null
`,
diff --git a/docs/api.md b/docs/api.md
index e0c219d54d..65e63306e4 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -48086,6 +48086,18 @@ All CR instances which the ServiceAccount has access to will be retrieved. This
Enabled indicates whether to use a PrometheusOperator custom resources as targets or not.
Name | +Type | +Description | +Required | +
---|---|---|---|
matchExpressions | +[]object | +
+ matchExpressions is a list of label selector requirements. The requirements are ANDed. + |
+ false | +
matchLabels | +map[string]string | +
+ matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+map is equivalent to an element of matchExpressions, whose key field is "key", the
+operator is "In", and the values array contains only "value". The requirements are ANDed. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
key | +string | +
+ key is the label key that the selector applies to. + |
+ true | +
operator | +string | +
+ operator represents a key's relationship to a set of values.
+Valid operators are In, NotIn, Exists and DoesNotExist. + |
+ true | +
values | +[]string | +
+ values is an array of string values. If the operator is In or NotIn,
+the values array must be non-empty. If the operator is Exists or DoesNotExist,
+the values array must be empty. This array is replaced during a strategic
+merge patch. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
key | +string | +
+ key is the label key that the selector applies to. + |
+ true | +
operator | +string | +
+ operator represents a key's relationship to a set of values.
+Valid operators are In, NotIn, Exists and DoesNotExist. + |
+ true | +
values | +[]string | +
+ values is an array of string values. If the operator is In or NotIn,
+the values array must be non-empty. If the operator is Exists or DoesNotExist,
+the values array must be empty. This array is replaced during a strategic
+merge patch. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
matchExpressions | +[]object | +
+ matchExpressions is a list of label selector requirements. The requirements are ANDed. + |
+ false | +
matchLabels | +map[string]string | +
+ matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+map is equivalent to an element of matchExpressions, whose key field is "key", the
+operator is "In", and the values array contains only "value". The requirements are ANDed. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
key | +string | +
+ key is the label key that the selector applies to. + |
+ true | +
operator | +string | +
+ operator represents a key's relationship to a set of values.
+Valid operators are In, NotIn, Exists and DoesNotExist. + |
+ true | +
values | +[]string | +
+ values is an array of string values. If the operator is In or NotIn,
+the values array must be non-empty. If the operator is Exists or DoesNotExist,
+the values array must be empty. This array is replaced during a strategic
+merge patch. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
matchExpressions | +[]object | +
+ matchExpressions is a list of label selector requirements. The requirements are ANDed. + |
+ false | +
matchLabels | +map[string]string | +
+ matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+map is equivalent to an element of matchExpressions, whose key field is "key", the
+operator is "In", and the values array contains only "value". The requirements are ANDed. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
key | +string | +
+ key is the label key that the selector applies to. + |
+ true | +
operator | +string | +
+ operator represents a key's relationship to a set of values.
+Valid operators are In, NotIn, Exists and DoesNotExist. + |
+ true | +
values | +[]string | +
+ values is an array of string values. If the operator is In or NotIn,
+the values array must be non-empty. If the operator is Exists or DoesNotExist,
+the values array must be empty. This array is replaced during a strategic
+merge patch. + |
+ false | +
Name | +Type | +Description | +Required | +
---|---|---|---|
matchExpressions | +[]object | +
+ matchExpressions is a list of label selector requirements. The requirements are ANDed. + |
+ false | +
matchLabels | +map[string]string | +
+ matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+map is equivalent to an element of matchExpressions, whose key field is "key", the
+operator is "In", and the values array contains only "value". The requirements are ANDed. + |
+ false | +