Merge pull request #185 from kube-logging/feat/support-custom-image

feat: support setting custom otelcol image

Author: csatib02

pkg/resources/manager/collector_manager.go

@@ -17,6 +17,7 @@ package manager
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math"
 	"path/filepath"
 	"strings"
@@ -472,47 +473,39 @@ func setOtelCommonFieldsDefaults(otelCommonFields *otelv1beta1.OpenTelemetryComm
 		otelCommonFields = &otelv1beta1.OpenTelemetryCommonFields{}
 	}
 
-	otelCommonFields.Image = axoflowOtelCollectorImageRef
+	if otelCommonFields.Image == "" {
+		otelCommonFields.Image = axoflowOtelCollectorImageRef
+	}
+
 	otelCommonFields.ServiceAccount = saName
 
 	if otelCommonFields.Args == nil {
 		otelCommonFields.Args = make(map[string]string)
 	}
-	for key, value := range additionalArgs {
-		otelCommonFields.Args[key] = value
-	}
-
-	volumeMounts := []corev1.VolumeMount{
-		{
-			Name:      "varlog",
-			ReadOnly:  true,
-			MountPath: "/var/log",
-		},
-		{
-			Name:      "varlibdockercontainers",
-			ReadOnly:  true,
-			MountPath: "/var/lib/docker/containers",
-		},
-	}
-	otelCommonFields.VolumeMounts = append(otelCommonFields.VolumeMounts, volumeMounts...)
-
-	volumes := []corev1.Volume{
-		{
-			Name: "varlog",
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "/var/log",
+	maps.Copy(otelCommonFields.Args, additionalArgs)
+
+	volumeConfigs := []struct {
+		name string
+		path string
+	}{
+		{name: "varlog", path: "/var/log"},
+		{name: "varlibdockercontainers", path: "/var/lib/docker/containers"},
+	}
+	for _, config := range volumeConfigs {
+		if !volumeExists(otelCommonFields.Volumes, config.name) {
+			otelCommonFields.Volumes = append(otelCommonFields.Volumes, corev1.Volume{
+				Name: config.name,
+				VolumeSource: corev1.VolumeSource{
+					HostPath: &corev1.HostPathVolumeSource{
+						Path: config.path,
+					},
 				},
-			},
-		},
-		{
-			Name: "varlibdockercontainers",
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "/var/lib/docker/containers",
-				},
-			},
-		},
+			})
+			otelCommonFields.VolumeMounts = append(otelCommonFields.VolumeMounts, corev1.VolumeMount{
+				Name:      config.name,
+				ReadOnly:  true,
+				MountPath: config.path,
+			})
+		}
 	}
-	otelCommonFields.Volumes = append(otelCommonFields.Volumes, volumes...)
 }

pkg/resources/manager/collector_manager_test.go

@@ -32,10 +32,8 @@ func TestSetOtelCommonFieldsDefaults(t *testing.T) {
 		expectedError       error
 	}{
 		{
-			name: "Basic Initialization",
-			initialCommonFields: &otelv1beta1.OpenTelemetryCommonFields{
-				Args: map[string]string{},
-			},
+			name:                "Basic Initialization",
+			initialCommonFields: &otelv1beta1.OpenTelemetryCommonFields{},
 			additionalArgs: map[string]string{
 				"key1": "value1",
 			},
@@ -139,6 +137,50 @@ func TestSetOtelCommonFieldsDefaults(t *testing.T) {
 			expectedResult: nil,
 			expectedError:  nil,
 		},
+		{
+			name: "custom image",
+			initialCommonFields: &otelv1beta1.OpenTelemetryCommonFields{
+				Image: "custom-image:latest",
+			},
+			additionalArgs: map[string]string{},
+			saName:         "test-sa",
+			expectedResult: &otelv1beta1.OpenTelemetryCommonFields{
+				Image:          "custom-image:latest",
+				ServiceAccount: "test-sa",
+				Args:           map[string]string{},
+				VolumeMounts: []corev1.VolumeMount{
+					{
+						Name:      "varlog",
+						ReadOnly:  true,
+						MountPath: "/var/log",
+					},
+					{
+						Name:      "varlibdockercontainers",
+						ReadOnly:  true,
+						MountPath: "/var/lib/docker/containers",
+					},
+				},
+				Volumes: []corev1.Volume{
+					{
+						Name: "varlog",
+						VolumeSource: corev1.VolumeSource{
+							HostPath: &corev1.HostPathVolumeSource{
+								Path: "/var/log",
+							},
+						},
+					},
+					{
+						Name: "varlibdockercontainers",
+						VolumeSource: corev1.VolumeSource{
+							HostPath: &corev1.HostPathVolumeSource{
+								Path: "/var/lib/docker/containers",
+							},
+						},
+					},
+				},
+			},
+			expectedError: nil,
+		},
 	}
 
 	for _, tt := range tests {