diff --git a/pkg/cronjob/spark_dependencies.go b/pkg/cronjob/spark_dependencies.go index c50c42a97..e9704c491 100644 --- a/pkg/cronjob/spark_dependencies.go +++ b/pkg/cronjob/spark_dependencies.go @@ -93,9 +93,9 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) *batchv1beta1.CronJob { Image: image, Name: name, // let spark job use its default values - Env: util.RemoveEmptyVars(envVars), - EnvFrom: envFromSource, - Resources: commonSpec.Resources, + Env: util.RemoveEmptyVars(envVars), + EnvFrom: envFromSource, + Resources: commonSpec.Resources, VolumeMounts: jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.VolumeMounts, }, }, @@ -104,7 +104,7 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) *batchv1beta1.CronJob { Tolerations: commonSpec.Tolerations, SecurityContext: commonSpec.SecurityContext, ServiceAccountName: account.JaegerServiceAccountFor(jaeger, account.DependenciesComponent), - Volumes: jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.Volumes, + Volumes: jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.Volumes, }, ObjectMeta: metav1.ObjectMeta{ Labels: commonSpec.Labels, diff --git a/pkg/cronjob/spark_dependencies_test.go b/pkg/cronjob/spark_dependencies_test.go index 3618b86c6..c036b23b2 100644 --- a/pkg/cronjob/spark_dependencies_test.go +++ b/pkg/cronjob/spark_dependencies_test.go @@ -230,22 +230,22 @@ func TestDependenciesVolumes(t *testing.T) { testConfigMapName := "dvConfigMap" jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestDependenciesVolumes"}) testVolume := corev1.Volume{ - Name: testVolumeName, + Name: testVolumeName, VolumeSource: corev1.VolumeSource{ - ConfigMap: &corev1.ConfigMapVolumeSource{ + ConfigMap: &corev1.ConfigMapVolumeSource{ LocalObjectReference: corev1.LocalObjectReference{Name: testConfigMapName}, }, }, } testVolumes := []corev1.Volume{testVolume} - jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.Volumes=testVolumes + jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.Volumes = testVolumes testVolumeMountName := "testVolumeMount" testMountPath := "/es-tls" testVolumeMount := corev1.VolumeMount{ - Name: testVolumeMountName, - ReadOnly: false, - MountPath: testMountPath, + Name: testVolumeMountName, + ReadOnly: false, + MountPath: testMountPath, } testVolumeMounts := []corev1.VolumeMount{testVolumeMount} jaeger.Spec.Storage.Dependencies.JaegerCommonSpec.VolumeMounts = testVolumeMounts