Manage args differently.

Author: mccheah

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStep.scala

@@ -96,8 +96,12 @@ private[spark] class BasicDriverFeatureStep(
       // The user application jar is merged into the spark.jars list and managed through that
       // property, so there is no need to reference it explicitly here.
       .addToArgs(SparkLauncher.NO_RESOURCE)
-      .addToArgs(kubernetesConf.roleSpecificConf.appArgs: _*)
       .build()
+    val driverContainerWithArgs = if (kubernetesConf.roleSpecificConf.appArgs.nonEmpty) {
+      new ContainerBuilder(driverContainer)
+        .addToArgs(kubernetesConf.roleSpecificConf.appArgs: _*)
+        .build()
+    } else driverContainer
 
     val driverPod = new PodBuilder(pod.pod)
       .editOrNewMetadata()
@@ -110,7 +114,7 @@ private[spark] class BasicDriverFeatureStep(
         .withNodeSelector(kubernetesConf.nodeSelector().asJava)
         .endSpec()
       .build()
-    SparkPod(driverPod, driverContainer)
+    SparkPod(driverPod, driverContainerWithArgs)
   }
 
   override def getAdditionalPodSystemProperties(): Map[String, String] = {