Skip to content

Commit

Permalink
Fix formatting issues
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Earls <kearls@redhat.com>
  • Loading branch information
kevinearls committed Jan 12, 2021
1 parent b1287f2 commit 1402483
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions pkg/cronjob/spark_dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand All @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions pkg/cronjob/spark_dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1402483

Please sign in to comment.