Apply total resource when BatchSchedulerOption is not nil (kubeflow#1072

)

* Apply total resource when BatchSchedulerOption is not nil

* Reduce unnecessary if statement in volcano_scheduler

pkg/batchscheduler/volcano/volcano_scheduler.go

@@ -75,12 +75,10 @@ func (v *VolcanoBatchScheduler) DoBatchSchedulingOnSubmission(app *v1beta2.Spark
 func (v *VolcanoBatchScheduler) syncPodGroupInClientMode(app *v1beta2.SparkApplication) error {
 	// We only care about the executor pods in client mode
 	if _, ok := app.Spec.Executor.Annotations[v1beta1.KubeGroupNameAnnotationKey]; !ok {
-		var totalResource corev1.ResourceList
-		requestResources := app.Spec.BatchSchedulerOptions.Resources
-		if len(requestResources) > 0 {
-			totalResource = requestResources
-		} else {
-			totalResource = getExecutorRequestResource(app)
+		totalResource := getExecutorRequestResource(app)
+
+		if app.Spec.BatchSchedulerOptions != nil && len(app.Spec.BatchSchedulerOptions.Resources) > 0 {
+			totalResource = app.Spec.BatchSchedulerOptions.Resources
 		}
 		if err := v.syncPodGroup(app, 1, totalResource); err == nil {
 			app.Spec.Executor.Annotations[v1beta1.KubeGroupNameAnnotationKey] = v.getAppPodGroupName(app)
@@ -97,9 +95,9 @@ func (v *VolcanoBatchScheduler) syncPodGroupInClusterMode(app *v1beta2.SparkAppl
 	if _, ok := app.Spec.Driver.Annotations[v1beta1.KubeGroupNameAnnotationKey]; !ok {
 		//Both driver and executor resource will be considered.
 		totalResource := sumResourceList([]corev1.ResourceList{getExecutorRequestResource(app), getDriverRequestResource(app)})
-		requestResources := app.Spec.BatchSchedulerOptions.Resources
-		if len(requestResources) > 0 {
-			totalResource = requestResources
+
+		if app.Spec.BatchSchedulerOptions != nil && len(app.Spec.BatchSchedulerOptions.Resources) > 0 {
+			totalResource = app.Spec.BatchSchedulerOptions.Resources
 		}
 		if err := v.syncPodGroup(app, 1, totalResource); err == nil {
 			app.Spec.Executor.Annotations[v1beta1.KubeGroupNameAnnotationKey] = v.getAppPodGroupName(app)