fix: add config parameter to updateCollectorStatus and fix e2e test

- Add config parameter to updateCollectorStatus for consistent image resolution

- Remove hardcoded version assertion from kubeletstats e2e test

Author: andrefrco

internal/status/collector/collector.go

@@ -13,13 +13,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
+	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
 	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 )
 
-func updateCollectorStatus(ctx context.Context, cli client.Client, changed *v1beta1.OpenTelemetryCollector) error {
+func updateCollectorStatus(ctx context.Context, cli client.Client, changed *v1beta1.OpenTelemetryCollector, cfg config.Config) error {
 	if changed.Status.Version == "" {
 		// a version is not set, otherwise let the upgrade mechanism take care of it!
 		changed.Status.Version = version.OpenTelemetryCollector()
@@ -36,7 +37,11 @@ func updateCollectorStatus(ctx context.Context, cli client.Client, changed *v1be
 	name := naming.Collector(changed.Name)
 
 	// Set the scale selector
-	labels := manifestutils.Labels(changed.ObjectMeta, name, changed.Spec.Image, collector.ComponentOpenTelemetryCollector, []string{})
+	image := changed.Spec.Image
+	if image == "" {
+		image = cfg.CollectorImage
+	}
+	labels := manifestutils.Labels(changed.ObjectMeta, name, image, collector.ComponentOpenTelemetryCollector, cfg.LabelsFilter)
 	selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{MatchLabels: labels})
 	if err != nil {
 		return fmt.Errorf("failed to get selector for labelSelector: %w", err)

internal/status/collector/collector_test.go

@@ -15,11 +15,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
+	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 )
 
 func TestUpdateCollectorStatusUnsupported(t *testing.T) {
 	ctx := context.TODO()
 	cli := client.Client(fake.NewFakeClient())
+	cfg := config.Config{}
 
 	changed := &v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
@@ -31,7 +33,7 @@ func TestUpdateCollectorStatusUnsupported(t *testing.T) {
 		},
 	}
 
-	err := updateCollectorStatus(ctx, cli, changed)
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
 	assert.NoError(t, err)
 
 	assert.Equal(t, int32(0), changed.Status.Scale.Replicas, "expected replicas to be 0")
@@ -67,6 +69,7 @@ func createMockKubernetesClientDeployment() client.Client {
 func TestUpdateCollectorStatusDeploymentMode(t *testing.T) {
 	ctx := context.TODO()
 	cli := createMockKubernetesClientDeployment()
+	cfg := config.Config{}
 
 	changed := &v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
@@ -78,7 +81,7 @@ func TestUpdateCollectorStatusDeploymentMode(t *testing.T) {
 		},
 	}
 
-	err := updateCollectorStatus(ctx, cli, changed)
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
 	assert.NoError(t, err)
 
 	assert.Equal(t, int32(1), changed.Status.Scale.Replicas, "expected replicas to be 1")
@@ -115,6 +118,7 @@ func createMockKubernetesClientStatefulset() client.Client {
 func TestUpdateCollectorStatusStatefulset(t *testing.T) {
 	ctx := context.TODO()
 	cli := createMockKubernetesClientStatefulset()
+	cfg := config.Config{}
 
 	changed := &v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
@@ -126,7 +130,7 @@ func TestUpdateCollectorStatusStatefulset(t *testing.T) {
 		},
 	}
 
-	err := updateCollectorStatus(ctx, cli, changed)
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
 	assert.NoError(t, err)
 
 	assert.Equal(t, int32(1), changed.Status.Scale.Replicas, "expected replicas to be 1")
@@ -163,6 +167,7 @@ func createMockKubernetesClientDaemonset() client.Client {
 func TestUpdateCollectorStatusDaemonsetMode(t *testing.T) {
 	ctx := context.TODO()
 	cli := createMockKubernetesClientDaemonset()
+	cfg := config.Config{}
 
 	changed := &v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
@@ -177,11 +182,79 @@ func TestUpdateCollectorStatusDaemonsetMode(t *testing.T) {
 		},
 	}
 
-	err := updateCollectorStatus(ctx, cli, changed)
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
 	assert.NoError(t, err)
 
 	assert.Equal(t, int32(1), changed.Status.Scale.Replicas, "expected replicas to be 1")
 	assert.Equal(t, "1/1", changed.Status.Scale.StatusReplicas, "expected status replicas to be 1/1")
 	assert.Contains(t, changed.Status.Scale.Selector, "customLabel=customValue", "expected selector to contain customlabel=customValue")
 	assert.Equal(t, "app:latest", changed.Status.Image, "expected image to be app:latest")
 }
+
+func TestUpdateCollectorStatusVersionLabelFromSpec(t *testing.T) {
+	ctx := context.TODO()
+	cli := createMockKubernetesClientDeployment()
+	cfg := config.Config{}
+
+	changed := &v1beta1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-deployment",
+			Namespace: "default",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			Mode: v1beta1.ModeDeployment,
+			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
+				Image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.129.1",
+			},
+		},
+	}
+
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
+	assert.NoError(t, err)
+
+	assert.Contains(t, changed.Status.Scale.Selector, "app.kubernetes.io/version=0.129.1", "expected selector to contain version label from spec")
+}
+
+func TestUpdateCollectorStatusVersionLabelFromConfig(t *testing.T) {
+	ctx := context.TODO()
+	cli := createMockKubernetesClientDeployment()
+	cfg := config.Config{
+		CollectorImage: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.130.0",
+	}
+
+	changed := &v1beta1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-deployment",
+			Namespace: "default",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			Mode: v1beta1.ModeDeployment,
+		},
+	}
+
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
+	assert.NoError(t, err)
+
+	assert.Contains(t, changed.Status.Scale.Selector, "app.kubernetes.io/version=0.130.0", "expected selector to contain version label from config")
+}
+
+func TestUpdateCollectorStatusVersionLabelLatest(t *testing.T) {
+	ctx := context.TODO()
+	cli := createMockKubernetesClientDeployment()
+	cfg := config.Config{}
+
+	changed := &v1beta1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-deployment",
+			Namespace: "default",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			Mode: v1beta1.ModeDeployment,
+		},
+	}
+
+	err := updateCollectorStatus(ctx, cli, changed, cfg)
+	assert.NoError(t, err)
+
+	assert.Contains(t, changed.Status.Scale.Selector, "app.kubernetes.io/version=latest", "expected selector to contain latest version label")
+}

internal/status/collector/handle.go

@@ -31,7 +31,7 @@ func HandleReconcileStatus(ctx context.Context, log logr.Logger, params manifest
 	}
 
 	changed := otelcol.DeepCopy()
-	statusErr := updateCollectorStatus(ctx, params.Client, changed)
+	statusErr := updateCollectorStatus(ctx, params.Client, changed, params.Config)
 
 	if statusErr != nil {
 		params.Recorder.Event(changed, corev1.EventTypeWarning, reasonStatusFailure, statusErr.Error())

tests/e2e-automatic-rbac/receiver-kubeletstats/01-assert.yaml

@@ -35,7 +35,6 @@ metadata:
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: simplest-collector
     app.kubernetes.io/part-of: opentelemetry
-    app.kubernetes.io/version: latest
   namespace: chainsaw-kubeletstats
 spec:
   containers: