fix/target-allocator: check CRDs availability in the cluster #4118
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iblancasa
reviewed
Jun 18, 2025
jaronoff97
reviewed
Jun 19, 2025
| for _, group := range apiGroups { | ||
| if group.Name == "monitoring.coreos.com" { | ||
| for _, version := range group.Versions { | ||
| resources, err := dcl.ServerResourcesForGroupVersion(version.GroupVersion) |
There was a problem hiding this comment.
I believe we'll need to update the TA's permissions in order for this to work https://github.com/open-telemetry/opentelemetry-operator/blob/main/apis/v1beta1/targetallocator_rbac.go#L18
Comment on lines
+232
to
243
| serviceMonitorAvailable, err := checkCRDAvailability(dcl, "servicemonitors") | ||
| if err != nil { | ||
| return nil, err | ||
| logger.Warn("Failed to check ServiceMonitor availability", "error", err) | ||
| } else if serviceMonitorAvailable { | ||
| serviceMonitorInformers, err2 := informers.NewInformersForResource(factory, monitoringv1.SchemeGroupVersion.WithResource(monitoringv1.ServiceMonitorName)) | ||
| if err2 != nil { | ||
| return nil, err2 | ||
| } | ||
| informersMap[monitoringv1.ServiceMonitorName] = serviceMonitorInformers | ||
| } else { | ||
| logger.Warn("ServiceMonitor CRD not available, skipping informer") | ||
| } |
There was a problem hiding this comment.
Should we make this a helper method? I also wonder if we should just return a no-op informer which may simplify where we actually get the instances below. What do you think?
| @@ -1303,3 +1304,38 @@ func sanitizeScrapeConfigsForTest(scs []*promconfig.ScrapeConfig) { | |||
| sc.MetricRelabelConfigs = nil | |||
| } | |||
| } | |||
|
|
|||
| // getTestInformers creates informers for testing without CRD availability checks. | |||
| func getTestInformers(factory informers.FactoriesForNamespaces) (map[string]*informers.ForResource, error) { | |||
There was a problem hiding this comment.
can you add new tests in here as well as in e2e to verify this works as expected?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
target-allocator: check CRDs availability in the cluster before querying them in order to prevent an unhandled error
Link to tracking Issue(s):
Testing:
tested on local k8s cluster to ensure the error is gone