[SPARK-22757][Kubernetes] Enable use of remote dependencies (http, s3, gcs, etc.) in Kubernetes mode #19954
Next
Next commit
[SPARK-22757][Kubernetes] Enable use of remote dependencies in Kubern…
…etes mode
- Loading branch information
commit d3cbbdd8ce45592caa706d0b4d29c873a176e40c
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{ContainerBuilder, EmptyDirVolumeSource, EnvVarBuilder, PodBuilder, VolumeMount, VolumeMountBuilder} | ||
|
|
||
| import org.apache.spark.{SparkConf, SparkException} | ||
| import org.apache.spark.deploy.k8s.Config._ | ||
| import org.apache.spark.deploy.k8s.Constants._ | ||
|
|
||
| /** | ||
| * This is separated out from the init-container steps API because this component can be reused to | ||
| * set up the init-container for executors as well. | ||
| */ | ||
| private[spark] trait InitContainerBootstrap { | ||
|
||
| /** | ||
| * Bootstraps an init-container that downloads dependencies to be used by a main container. | ||
| */ | ||
| def bootstrapInitContainer( | ||
| originalPodWithInitContainer: PodWithDetachedInitContainer) | ||
| : PodWithDetachedInitContainer | ||
| } | ||
|
|
||
| private[spark] class InitContainerBootstrapImpl( | ||
| initContainerImage: String, | ||
| dockerImagePullPolicy: String, | ||
| jarsDownloadPath: String, | ||
| filesDownloadPath: String, | ||
| downloadTimeoutMinutes: Long, | ||
| initContainerConfigMapName: String, | ||
| initContainerConfigMapKey: String, | ||
| sparkRole: String, | ||
| sparkConf: SparkConf) | ||
| extends InitContainerBootstrap { | ||
|
|
||
| override def bootstrapInitContainer( | ||
| podWithDetachedInitContainer: PodWithDetachedInitContainer): PodWithDetachedInitContainer = { | ||
|
||
| val sharedVolumeMounts = Seq[VolumeMount]( | ||
| new VolumeMountBuilder() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_JARS_VOLUME_NAME) | ||
| .withMountPath(jarsDownloadPath) | ||
| .build(), | ||
| new VolumeMountBuilder() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_FILES_VOLUME_NAME) | ||
| .withMountPath(filesDownloadPath) | ||
| .build()) | ||
|
|
||
| val initContainerCustomEnvVarKeyPrefix = sparkRole match { | ||
| case SPARK_POD_DRIVER_ROLE => KUBERNETES_DRIVER_ENV_KEY | ||
| case SPARK_POD_EXECUTOR_ROLE => "spark.executorEnv." | ||
| case _ => throw new SparkException(s"$sparkRole is not a valid Spark pod role") | ||
| } | ||
| val initContainerCustomEnvVars = sparkConf.getAllWithPrefix(initContainerCustomEnvVarKeyPrefix) | ||
| .toSeq | ||
| .map(env => | ||
|
||
| new EnvVarBuilder() | ||
| .withName(env._1) | ||
| .withValue(env._2) | ||
| .build()) | ||
|
|
||
| val initContainer = new ContainerBuilder(podWithDetachedInitContainer.initContainer) | ||
| .withName(s"spark-init") | ||
|
||
| .withImage(initContainerImage) | ||
| .withImagePullPolicy(dockerImagePullPolicy) | ||
| .addAllToEnv(initContainerCustomEnvVars.asJava) | ||
| .addNewVolumeMount() | ||
| .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME) | ||
| .withMountPath(INIT_CONTAINER_PROPERTIES_FILE_DIR) | ||
| .endVolumeMount() | ||
| .addToVolumeMounts(sharedVolumeMounts: _*) | ||
| .addToArgs(INIT_CONTAINER_PROPERTIES_FILE_PATH) | ||
| .build() | ||
|
|
||
| val podWithBasicVolumes = new PodBuilder(podWithDetachedInitContainer.pod) | ||
| .editSpec() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME) | ||
| .withNewConfigMap() | ||
| .withName(initContainerConfigMapName) | ||
| .addNewItem() | ||
| .withKey(initContainerConfigMapKey) | ||
| .withPath(INIT_CONTAINER_PROPERTIES_FILE_NAME) | ||
| .endItem() | ||
| .endConfigMap() | ||
| .endVolume() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_JARS_VOLUME_NAME) | ||
| .withEmptyDir(new EmptyDirVolumeSource()) | ||
| .endVolume() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_FILES_VOLUME_NAME) | ||
| .withEmptyDir(new EmptyDirVolumeSource()) | ||
| .endVolume() | ||
| .endSpec() | ||
| .build() | ||
|
|
||
| val mainContainerWithMountedFiles = new ContainerBuilder( | ||
| podWithDetachedInitContainer.mainContainer) | ||
| .addToVolumeMounts(sharedVolumeMounts: _*) | ||
| .addNewEnv() | ||
| .withName(ENV_MOUNTED_FILES_DIR) | ||
| .withValue(filesDownloadPath) | ||
| .endEnv() | ||
| .build() | ||
|
|
||
| PodWithDetachedInitContainer( | ||
| podWithBasicVolumes, | ||
| initContainer, | ||
| mainContainerWithMountedFiles) | ||
| } | ||
|
|
||
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder} | ||
|
|
||
| /** | ||
| * Bootstraps a driver or executor container or an init-container with needed secrets mounted. | ||
| */ | ||
| private[spark] trait MountSecretsBootstrap { | ||
|
|
||
| /** | ||
| * Mounts Kubernetes secrets as secret volumes into the given container in the given pod. | ||
| * | ||
| * @param pod the pod into which the secret volumes are being added. | ||
| * @param container the container into which the secret volumes are being mounted. | ||
| * @return the updated pod and container with the secrets mounted. | ||
| */ | ||
| def mountSecrets(pod: Pod, container: Container): (Pod, Container) | ||
| } | ||
|
|
||
| private[spark] class MountSecretsBootstrapImpl( | ||
| secretNamesToMountPaths: Map[String, String]) extends MountSecretsBootstrap { | ||
|
|
||
| override def mountSecrets(pod: Pod, container: Container): (Pod, Container) = { | ||
| var podBuilder = new PodBuilder(pod) | ||
| secretNamesToMountPaths.keys.foreach(name => | ||
|
||
| podBuilder = podBuilder | ||
| .editOrNewSpec() | ||
| .addNewVolume() | ||
| .withName(secretVolumeName(name)) | ||
| .withNewSecret() | ||
| .withSecretName(name) | ||
| .endSecret() | ||
| .endVolume() | ||
| .endSpec()) | ||
|
|
||
| var containerBuilder = new ContainerBuilder(container) | ||
| secretNamesToMountPaths.foreach(namePath => | ||
|
||
| containerBuilder = containerBuilder | ||
| .addNewVolumeMount() | ||
| .withName(secretVolumeName(namePath._1)) | ||
| .withMountPath(namePath._2) | ||
| .endVolumeMount() | ||
| ) | ||
|
|
||
| (podBuilder.build(), containerBuilder.build()) | ||
| } | ||
|
|
||
| private def secretVolumeName(secretName: String): String = { | ||
| secretName + "-volume" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{Container, Pod} | ||
|
|
||
| /** | ||
| * Represents a pod with a detached init-container (not yet added to the pod). | ||
| * | ||
| * @param pod the pod | ||
| * @param initContainer the init-container in the pod | ||
| * @param mainContainer the main container in the pod | ||
| */ | ||
| private[spark] case class PodWithDetachedInitContainer( | ||
| pod: Pod, | ||
| initContainer: Container, | ||
| mainContainer: Container) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mirroring the discussion in the other PR, are these really restricted to docker? Is it a required config?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
None of it is docker specific, can be
containereverywhere.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, as one may forgo the init container if they're building the deps into the docker image itself and supplying it via
local:///paths.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Renamed to
spark.kubernetes.initContainer.image.