Github user mccheah commented on a diff in the pull request: https://github.com/apache/spark/pull/21092#discussion_r186244541 --- Diff: resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/bindings/PythonDriverFeatureStep.scala --- @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.spark.deploy.k8s.features.bindings + +import io.fabric8.kubernetes.api.model.ContainerBuilder +import io.fabric8.kubernetes.api.model.HasMetadata + +import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesRoleSpecificConf, SparkPod} +import org.apache.spark.deploy.k8s.Constants._ +import org.apache.spark.deploy.k8s.KubernetesUtils +import org.apache.spark.deploy.k8s.features.KubernetesFeatureConfigStep + +private[spark] class PythonDriverFeatureStep( + kubernetesConf: KubernetesConf[_ <: KubernetesRoleSpecificConf]) + extends KubernetesFeatureConfigStep { + override def configurePod(pod: SparkPod): SparkPod = { + val mainResource = kubernetesConf.pySparkMainResource() + require(mainResource.isDefined, "PySpark Main Resource must be defined") + val otherPyFiles = kubernetesConf.pyFiles().map(pyFile => + KubernetesUtils.resolveFileUrisAndPath(pyFile.split(",")) + .mkString(":")).getOrElse("") + val withPythonPrimaryFileContainer = new ContainerBuilder(pod.container) + .addNewEnv() + .withName(ENV_PYSPARK_ARGS) + .withValue(kubernetesConf.pySparkAppArgs().getOrElse("")) + .endEnv() + .addNewEnv() + .withName(ENV_PYSPARK_PRIMARY) + .withValue(KubernetesUtils.resolveFileUri(mainResource.get)) + .endEnv() + .addNewEnv() + .withName(ENV_PYSPARK_FILES) + .withValue(if (otherPyFiles == "") {""} else otherPyFiles) --- End diff -- Don't add empty env vars - see above.
--- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org