Skip to content

Commit 654875e

Browse files
authored
[chore] inline code called once (#3638)
1 parent 8e6f2d0 commit 654875e

File tree

4 files changed

+6
-70
lines changed

4 files changed

+6
-70
lines changed

internal/status/opampbridge/handle.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/client"
2424

2525
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
26+
"github.com/open-telemetry/opentelemetry-operator/internal/version"
2627
)
2728

2829
const (
@@ -43,10 +44,8 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params manifest
4344
}
4445
changed := params.OpAMPBridge.DeepCopy()
4546

46-
statusErr := UpdateOpAMPBridgeStatus(ctx, params.Client, changed)
47-
if statusErr != nil {
48-
params.Recorder.Event(changed, eventTypeWarning, reasonStatusFailure, statusErr.Error())
49-
return ctrl.Result{}, statusErr
47+
if changed.Status.Version == "" {
48+
changed.Status.Version = version.OperatorOpAMPBridge()
5049
}
5150
statusPatch := client.MergeFrom(&params.OpAMPBridge)
5251
if err := params.Client.Status().Patch(ctx, changed, statusPatch); err != nil {

internal/status/opampbridge/opampbridge.go

-31
This file was deleted.

internal/status/targetallocator/handle.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/client"
2424

2525
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
26+
"github.com/open-telemetry/opentelemetry-operator/internal/version"
2627
)
2728

2829
const (
@@ -43,10 +44,8 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params targetal
4344
}
4445
changed := params.TargetAllocator.DeepCopy()
4546

46-
statusErr := UpdateTargetAllocatorStatus(ctx, params.Client, changed)
47-
if statusErr != nil {
48-
params.Recorder.Event(changed, eventTypeWarning, reasonStatusFailure, statusErr.Error())
49-
return ctrl.Result{}, statusErr
47+
if changed.Status.Version == "" {
48+
changed.Status.Version = version.TargetAllocator()
5049
}
5150
statusPatch := client.MergeFrom(&params.TargetAllocator)
5251
if err := params.Client.Status().Patch(ctx, changed, statusPatch); err != nil {

internal/status/targetallocator/targetallocator.go

-31
This file was deleted.

0 commit comments

Comments
 (0)