This is an automated email from the ASF dual-hosted git repository. srowen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new 5fb5a02 [MINOR][K8S] add missing docs for podTemplateContainerName properties 5fb5a02 is described below commit 5fb5a0292d9ced48860abe712a10cbb8e513b75a Author: Adrian Tanase <atan...@adobe.com> AuthorDate: Mon Jan 7 19:03:38 2019 -0600 [MINOR][K8S] add missing docs for podTemplateContainerName properties ## What changes were proposed in this pull request? Adding docs for an enhancement that came in late in this PR: #22146 Currently the docs state that we're going to use the first container in a pod template, which was the implementation for some time, until it was improved with 2 new properties. ## How was this patch tested? I tested that the properties work by combining pod templates with client-mode and a simple pod template. Please review http://spark.apache.org/contributing.html before opening a pull request. Closes #23155 from aditanase/k8s-readme. Authored-by: Adrian Tanase <atan...@adobe.com> Signed-off-by: Sean Owen <sean.o...@databricks.com> --- docs/running-on-kubernetes.md | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/docs/running-on-kubernetes.md b/docs/running-on-kubernetes.md index 3172b1b..3453ee9 100644 --- a/docs/running-on-kubernetes.md +++ b/docs/running-on-kubernetes.md @@ -229,8 +229,11 @@ pod template that will always be overwritten by Spark. Therefore, users of this the pod template file only lets Spark start with a template pod instead of an empty pod during the pod-building process. For details, see the [full list](#pod-template-properties) of pod template values that will be overwritten by spark. -Pod template files can also define multiple containers. In such cases, Spark will always assume that the first container in -the list will be the driver or executor container. +Pod template files can also define multiple containers. In such cases, you can use the spark properties +`spark.kubernetes.driver.podTemplateContainerName` and `spark.kubernetes.executor.podTemplateContainerName` +to indicate which container should be used as a basis for the driver or executor. +If not specified, or if the container name is not valid, Spark will assume that the first container in the list +will be the driver or executor container. ## Using Kubernetes Volumes @@ -932,16 +935,32 @@ specific to Spark on Kubernetes. <td><code>spark.kubernetes.driver.podTemplateFile</code></td> <td>(none)</td> <td> - Specify the local file that contains the driver [pod template](#pod-template). For example - <code>spark.kubernetes.driver.podTemplateFile=/path/to/driver-pod-template.yaml`</code> + Specify the local file that contains the driver <a href="#pod-template">pod template</a>. For example + <code>spark.kubernetes.driver.podTemplateFile=/path/to/driver-pod-template.yaml</code> + </td> +</tr> +<tr> + <td><code>spark.kubernetes.driver.podTemplateContainerName</code></td> + <td>(none)</td> + <td> + Specify the container name to be used as a basis for the driver in the given <a href="#pod-template">pod template</a>. + For example <code>spark.kubernetes.driver.podTemplateContainerName=spark-driver</code> </td> </tr> <tr> <td><code>spark.kubernetes.executor.podTemplateFile</code></td> <td>(none)</td> <td> - Specify the local file that contains the executor [pod template](#pod-template). For example - <code>spark.kubernetes.executor.podTemplateFile=/path/to/executor-pod-template.yaml`</code> + Specify the local file that contains the executor <a href="#pod-template">pod template</a>. For example + <code>spark.kubernetes.executor.podTemplateFile=/path/to/executor-pod-template.yaml</code> + </td> +</tr> +<tr> + <td><code>spark.kubernetes.executor.podTemplateContainerName</code></td> + <td>(none)</td> + <td> + Specify the container name to be used as a basis for the executor in the given <a href="#pod-template">pod template</a>. + For example <code>spark.kubernetes.executor.podTemplateContainerName=spark-executor</code> </td> </tr> <tr> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org