Skip to content

Commit 29135cd

Browse files
committed
Fixed controller test
Signed-off-by: Yuri Sa <[email protected]>
1 parent 20c7bf6 commit 29135cd

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

controllers/builder_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2323
"github.com/stretchr/testify/require"
2424
appsv1 "k8s.io/api/apps/v1"
25-
autoscalingv2 "k8s.io/api/autoscaling/v2"
2625
corev1 "k8s.io/api/core/v1"
2726
networkingv1 "k8s.io/api/networking/v1"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

controllers/common.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"fmt"
2121

2222
"github.com/go-logr/logr"
23-
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
24-
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
2523
routev1 "github.com/openshift/api/route/v1"
2624
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2725
autoscalingv2 "k8s.io/api/autoscaling/v2"
@@ -37,11 +35,13 @@ import (
3735
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3836

3937
"github.com/open-telemetry/opentelemetry-operator/internal/api/convert"
38+
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
4039
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
4140
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
4241
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
4342
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/opampbridge"
4443
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
44+
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
4545
"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
4646
)
4747

@@ -109,7 +109,7 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
109109

110110
if otelCol.Spec.Observability.Metrics.EnableMetrics && featuregate.PrometheusOperatorIsAvailable.IsEnabled() {
111111
servicemonitorList := &monitoringv1.ServiceMonitorList{}
112-
err := r.List(ctx, servicemonitorList, listOps)
112+
err = r.List(ctx, servicemonitorList, listOps)
113113
if err != nil {
114114
return nil, fmt.Errorf("Error listing ServiceMonitors: %w", err)
115115
}

0 commit comments

Comments
 (0)