Implemented path on ConfigMapsSpec

Signed-off-by: Yuri Sa <yurimsa@gmail.com>

apis/v1alpha1/opentelemetrycollector_types.go

@@ -479,6 +479,7 @@ type ConfigMapsSpec struct {
 	Name      string `json:"name,omitempty"`
 	MountPath string `json:"mountpath,omitempty"`
 }
+
 func init() {
 	SchemeBuilder.Register(&OpenTelemetryCollector{}, &OpenTelemetryCollectorList{})
 }

internal/manifests/collector/container.go

@@ -110,8 +110,8 @@ func Container(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem
 	if len(otelcol.Spec.ConfigMaps) > 0 {
 		for keyCfgMap := range otelcol.Spec.ConfigMaps {
 			volumeMounts = append(volumeMounts, corev1.VolumeMount{
-				Name: otelcol.Spec.ConfigMaps[keyCfgMap].Name,
-				MountPath: otelcol.Spec.ConfigMaps[keyCfgMap].MountPath+"/"+otelcol.Spec.ConfigMaps[keyCfgMap].Name,
+				Name:      otelcol.Spec.ConfigMaps[keyCfgMap].Name,
+				MountPath: otelcol.Spec.ConfigMaps[keyCfgMap].MountPath + "/" + otelcol.Spec.ConfigMaps[keyCfgMap].Name,
 			})
 		}
 	}

internal/manifests/collector/container_test.go

@@ -276,6 +276,32 @@ func TestContainerCustomVolumes(t *testing.T) {
 	assert.Equal(t, "custom-volume-mount", c.VolumeMounts[1].Name)
 }
 
+func TestContainerCustomConfigMapsVolumes(t *testing.T) {
+	// prepare
+	otelcol := v1alpha1.OpenTelemetryCollector{
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			ConfigMaps: []v1alpha1.ConfigMapsSpec{{
+				Name:      "configmap-test",
+				MountPath: "/var/conf",
+			},
+				{
+					Name:      "configmap-test2",
+					MountPath: "/var/conf",
+				},
+			},
+		},
+	}
+	cfg := config.New()
+
+	// test
+	c := Container(cfg, logger, otelcol, true)
+
+	// verify
+	assert.Len(t, c.VolumeMounts, 3)
+	assert.Equal(t, "configmap-test", c.VolumeMounts[1].Name)
+	assert.Equal(t, "configmap-test2", c.VolumeMounts[2].Name)
+}
+
 func TestContainerCustomSecurityContext(t *testing.T) {
 	// default config without security context
 	c1 := Container(config.New(), logger, v1alpha1.OpenTelemetryCollector{Spec: v1alpha1.OpenTelemetryCollectorSpec{}}, true)

internal/manifests/collector/volume_test.go

@@ -67,14 +67,13 @@ func TestVolumeWithMoreConfigMaps(t *testing.T) {
 	otelcol := v1alpha1.OpenTelemetryCollector{
 		Spec: v1alpha1.OpenTelemetryCollectorSpec{
 			ConfigMaps: []v1alpha1.ConfigMapsSpec{{
-					Name: "configmap-test",
-					MountPath: "/var/conf/",
-				},
-				{
-					Name: "configmap-test2",
-					MountPath: "/var/conf/",
-				},
+				Name:      "configmap-test",
+				MountPath: "/var/conf",
 			},
+				{
+					Name:      "configmap-test2",
+					MountPath: "/var/conf",
+				}},
 		},
 	}
 	cfg := config.New()