Skip to content

Commit afa4e03

Browse files
authored
[chore] unexport updateCollectorStatus function (#3639)
1 parent 8128cdb commit afa4e03

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

internal/status/collector/collector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/open-telemetry/opentelemetry-operator/internal/version"
2020
)
2121

22-
func UpdateCollectorStatus(ctx context.Context, cli client.Client, changed *v1beta1.OpenTelemetryCollector) error {
22+
func updateCollectorStatus(ctx context.Context, cli client.Client, changed *v1beta1.OpenTelemetryCollector) error {
2323
if changed.Status.Version == "" {
2424
// a version is not set, otherwise let the upgrade mechanism take care of it!
2525
changed.Status.Version = version.OpenTelemetryCollector()

internal/status/collector/collector_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestUpdateCollectorStatusUnsupported(t *testing.T) {
3131
},
3232
}
3333

34-
err := UpdateCollectorStatus(ctx, cli, changed)
34+
err := updateCollectorStatus(ctx, cli, changed)
3535
assert.NoError(t, err)
3636

3737
assert.Equal(t, int32(0), changed.Status.Scale.Replicas, "expected replicas to be 0")
@@ -78,7 +78,7 @@ func TestUpdateCollectorStatusDeploymentMode(t *testing.T) {
7878
},
7979
}
8080

81-
err := UpdateCollectorStatus(ctx, cli, changed)
81+
err := updateCollectorStatus(ctx, cli, changed)
8282
assert.NoError(t, err)
8383

8484
assert.Equal(t, int32(1), changed.Status.Scale.Replicas, "expected replicas to be 1")
@@ -126,7 +126,7 @@ func TestUpdateCollectorStatusStatefulset(t *testing.T) {
126126
},
127127
}
128128

129-
err := UpdateCollectorStatus(ctx, cli, changed)
129+
err := updateCollectorStatus(ctx, cli, changed)
130130
assert.NoError(t, err)
131131

132132
assert.Equal(t, int32(1), changed.Status.Scale.Replicas, "expected replicas to be 1")
@@ -173,7 +173,7 @@ func TestUpdateCollectorStatusDaemonsetMode(t *testing.T) {
173173
},
174174
}
175175

176-
err := UpdateCollectorStatus(ctx, cli, changed)
176+
err := updateCollectorStatus(ctx, cli, changed)
177177
assert.NoError(t, err)
178178

179179
assert.Contains(t, changed.Status.Scale.Selector, "customLabel=customValue", "expected selector to contain customlabel=customValue")

internal/status/collector/handle.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params manifest
4747
log.V(2).Error(upgradeErr, "failed to upgrade the OpenTelemetry CR")
4848
}
4949
changed = &upgraded
50-
statusErr := UpdateCollectorStatus(ctx, params.Client, changed)
50+
statusErr := updateCollectorStatus(ctx, params.Client, changed)
5151
if statusErr != nil {
5252
params.Recorder.Event(changed, eventTypeWarning, reasonStatusFailure, statusErr.Error())
5353
return ctrl.Result{}, statusErr

0 commit comments

Comments
 (0)