[chore] inline code called once (#3638)

open-telemetry · Feb 4, 2025 · 654875e · 654875e
1 parent 8e6f2d0
commit 654875e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 70 deletions.
diff --git a/internal/status/opampbridge/handle.go b/internal/status/opampbridge/handle.go
@@ -23,6 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
+	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 )
 
 const (
@@ -43,10 +44,8 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params manifest
 	}
 	changed := params.OpAMPBridge.DeepCopy()
 
-	statusErr := UpdateOpAMPBridgeStatus(ctx, params.Client, changed)
-	if statusErr != nil {
-		params.Recorder.Event(changed, eventTypeWarning, reasonStatusFailure, statusErr.Error())
-		return ctrl.Result{}, statusErr
+	if changed.Status.Version == "" {
+		changed.Status.Version = version.OperatorOpAMPBridge()
 	}
 	statusPatch := client.MergeFrom(&params.OpAMPBridge)
 	if err := params.Client.Status().Patch(ctx, changed, statusPatch); err != nil {

diff --git a/internal/status/opampbridge/opampbridge.go b/internal/status/opampbridge/opampbridge.go
diff --git a/internal/status/targetallocator/handle.go b/internal/status/targetallocator/handle.go
@@ -23,6 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
+	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 )
 
 const (
@@ -43,10 +44,8 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params targetal
 	}
 	changed := params.TargetAllocator.DeepCopy()
 
-	statusErr := UpdateTargetAllocatorStatus(ctx, params.Client, changed)
-	if statusErr != nil {
-		params.Recorder.Event(changed, eventTypeWarning, reasonStatusFailure, statusErr.Error())
-		return ctrl.Result{}, statusErr
+	if changed.Status.Version == "" {
+		changed.Status.Version = version.TargetAllocator()
 	}
 	statusPatch := client.MergeFrom(&params.TargetAllocator)
 	if err := params.Client.Status().Patch(ctx, changed, statusPatch); err != nil {

diff --git a/internal/status/targetallocator/targetallocator.go b/internal/status/targetallocator/targetallocator.go