Add Extra config map configuration for all

Added Extra config map configuration for
tobiko and horizon tests

Author: eshulman2

pkg/horizontest/job.go

@@ -61,7 +61,7 @@ func Job(
 							Image:           containerImage,
 							Args:            []string{},
 							Env:             env.MergeEnvs([]corev1.EnvVar{}, envVars),
-							VolumeMounts:    GetVolumeMounts(mountCerts, mountKeys, mountKubeconfig),
+							VolumeMounts:    GetVolumeMounts(mountCerts, mountKeys, mountKubeconfig, instance),
 							SecurityContext: &securityContext,
 							Resources: corev1.ResourceRequirements{
 								Limits: util.GetResourceLimits(),

pkg/horizontest/volumes.go

@@ -18,6 +18,7 @@ func GetVolumes(
 	//var privateKeyMode int32 = 0600
 	//var publicKeyMode int32 = 0644
 	var tlsCertificateMode int32 = 0444
+	var publicInfoMode int32 = 0744
 
 	volumes := []corev1.Volume{
 		{
@@ -94,12 +95,27 @@ func GetVolumes(
 
 		volumes = append(volumes, kubeconfigVolume)
 	}
+	for _, vol := range instance.Spec.ExtraConfigmapsMounts {
+		extraVol := corev1.Volume{
+			Name: vol.Name,
+			VolumeSource: corev1.VolumeSource{
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					DefaultMode: &publicInfoMode,
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: vol.Name,
+					},
+				},
+			},
+		}
+
+		volumes = append(volumes, extraVol)
+	}
 
 	return volumes
 }
 
 // GetVolumeMounts -
-func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool) []corev1.VolumeMount {
+func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool, instance *testv1beta1.HorizonTest) []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
 			Name:      "test-operator-logs",
@@ -177,5 +193,17 @@ func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool) []co
 		volumeMounts = append(volumeMounts, kubeconfigMount)
 	}
 
+	for _, vol := range instance.Spec.ExtraConfigmapsMounts {
+
+		extraMounts := corev1.VolumeMount{
+			Name:      vol.Name,
+			MountPath: vol.MountPath,
+			SubPath:   vol.SubPath,
+			ReadOnly:  true,
+		}
+
+		volumeMounts = append(volumeMounts, extraMounts)
+	}
+
 	return volumeMounts
 }

pkg/tobiko/job.go

@@ -66,7 +66,7 @@ func Job(
 							Image:           containerImage,
 							Args:            []string{},
 							Env:             env.MergeEnvs([]corev1.EnvVar{}, envVars),
-							VolumeMounts:    GetVolumeMounts(mountCerts, mountKeys, mountKubeconfig),
+							VolumeMounts:    GetVolumeMounts(mountCerts, mountKeys, mountKubeconfig, instance),
 							SecurityContext: &securityContext,
 							Resources: corev1.ResourceRequirements{
 								Limits: util.GetResourceLimits(),

pkg/tobiko/volumes.go

@@ -19,6 +19,7 @@ func GetVolumes(
 	var privateKeyMode int32 = 0600
 	var publicKeyMode int32 = 0644
 	var tlsCertificateMode int32 = 0444
+	var publicInfoMode int32 = 0744
 
 	volumes := []corev1.Volume{
 		{
@@ -126,11 +127,27 @@ func GetVolumes(
 		volumes = append(volumes, kubeconfigVolume)
 	}
 
+	for _, vol := range instance.Spec.ExtraConfigmapsMounts {
+		extraVol := corev1.Volume{
+			Name: vol.Name,
+			VolumeSource: corev1.VolumeSource{
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					DefaultMode: &publicInfoMode,
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: vol.Name,
+					},
+				},
+			},
+		}
+
+		volumes = append(volumes, extraVol)
+	}
+
 	return volumes
 }
 
 // GetVolumeMounts -
-func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool) []corev1.VolumeMount {
+func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool, instance *testv1beta1.Tobiko) []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
 			Name:      "test-operator-logs",
@@ -214,5 +231,17 @@ func GetVolumeMounts(mountCerts bool, mountKeys bool, mountKubeconfig bool) []co
 		volumeMounts = append(volumeMounts, kubeconfigMount)
 	}
 
+	for _, vol := range instance.Spec.ExtraConfigmapsMounts {
+
+		extraMounts := corev1.VolumeMount{
+			Name:      vol.Name,
+			MountPath: vol.MountPath,
+			SubPath:   vol.SubPath,
+			ReadOnly:  true,
+		}
+
+		volumeMounts = append(volumeMounts, extraMounts)
+	}
+
 	return volumeMounts
 }