[SPARK-23146][WIP] Support client mode for Kubernetes in Out-Cluster mode #20451
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
|
There was a problem hiding this comment. We have |
||
| * 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 | ||
|
|
||
| private[spark] object OptionRequirements { | ||
|
|
||
| def requireBothOrNeitherDefined( | ||
|
There was a problem hiding this comment. not used, and if it were, perhaps would be clearer as (opt1, opt2) match {
case (Some(val1), None) =>
...
case (None, Some(val2)) =>
...
case _ => // ok
}There was a problem hiding this comment. This is part of unused code that could be fixed in other PR (e.g. #21462). Will double check after merging master, but normally, client-mode does not impact this. |
||
| opt1: Option[_], | ||
| opt2: Option[_], | ||
| errMessageWhenFirstIsMissing: String, | ||
| errMessageWhenSecondIsMissing: String): Unit = { | ||
| requireSecondIfFirstIsDefined(opt1, opt2, errMessageWhenSecondIsMissing) | ||
| requireSecondIfFirstIsDefined(opt2, opt1, errMessageWhenFirstIsMissing) | ||
| } | ||
|
|
||
| def requireSecondIfFirstIsDefined( | ||
| opt1: Option[_], opt2: Option[_], errMessageWhenSecondIsMissing: String): Unit = { | ||
| opt1.foreach { _ => | ||
| require(opt2.isDefined, errMessageWhenSecondIsMissing) | ||
| } | ||
| } | ||
|
|
||
| def requireNandDefined(opt1: Option[_], opt2: Option[_], errMessage: String): Unit = { | ||
| opt1.foreach { _ => require(opt2.isEmpty, errMessage) } | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ import java.io.File | |
|
|
||
| import com.google.common.base.Charsets | ||
| import com.google.common.io.Files | ||
| import io.fabric8.kubernetes.client.{Config => Fabric8Client, ConfigBuilder, DefaultKubernetesClient, KubernetesClient} | ||
| import io.fabric8.kubernetes.client.utils.HttpClientUtils | ||
| import okhttp3.Dispatcher | ||
|
|
||
|
|
@@ -36,6 +36,21 @@ import org.apache.spark.util.ThreadUtils | |
| private[spark] object SparkKubernetesClientFactory { | ||
|
|
||
| def createKubernetesClient( | ||
| master: String, | ||
| namespace: Option[String], | ||
| kubernetesAuthConfPrefix: String, | ||
| sparkConf: SparkConf, | ||
| maybeServiceAccountToken: Option[File], | ||
| maybeServiceAccountCaCert: Option[File]): KubernetesClient = { | ||
| new java.io.File(Fabric8Client.KUBERNETES_SERVICE_ACCOUNT_TOKEN_PATH).exists() match { | ||
| case true => createInClusterKubernetesClient(master, namespace, kubernetesAuthConfPrefix, | ||
| sparkConf, maybeServiceAccountToken, maybeServiceAccountCaCert) | ||
| case false => createOutClusterKubernetesClient(master, namespace, kubernetesAuthConfPrefix, | ||
| sparkConf, maybeServiceAccountToken, maybeServiceAccountCaCert) | ||
| } | ||
| } | ||
|
|
||
| private def createInClusterKubernetesClient( | ||
| master: String, | ||
| namespace: Option[String], | ||
| kubernetesAuthConfPrefix: String, | ||
|
|
@@ -88,6 +103,56 @@ private[spark] object SparkKubernetesClientFactory { | |
| new DefaultKubernetesClient(httpClientWithCustomDispatcher, config) | ||
| } | ||
|
|
||
| def createOutClusterKubernetesClient( | ||
| master: String, | ||
|
|
||
| namespace: Option[String], | ||
| kubernetesAuthConfPrefix: String, | ||
| sparkConf: SparkConf, | ||
| maybeServiceAccountToken: Option[File], | ||
| maybeServiceAccountCaCert: Option[File]): KubernetesClient = { | ||
| val oauthTokenFileConf = s"$kubernetesAuthConfPrefix.$OAUTH_TOKEN_FILE_CONF_SUFFIX" | ||
| val oauthTokenConf = s"$kubernetesAuthConfPrefix.$OAUTH_TOKEN_CONF_SUFFIX" | ||
| val oauthTokenFile = sparkConf.getOption(oauthTokenFileConf) | ||
| .map(new File(_)) | ||
| .orElse(maybeServiceAccountToken) | ||
| val oauthTokenValue = sparkConf.getOption(oauthTokenConf) | ||
| OptionRequirements.requireNandDefined( | ||
|
There was a problem hiding this comment. Since it's only used once I'm not sure it warrents a separate file/method for checking Options. There was a problem hiding this comment. I did not introduce |
||
| oauthTokenFile, | ||
| oauthTokenValue, | ||
| s"Cannot specify OAuth token through both a file $oauthTokenFileConf and a" + | ||
| s" value $oauthTokenConf.") | ||
|
|
||
| val caCertFile = sparkConf | ||
| .getOption(s"$kubernetesAuthConfPrefix.$CA_CERT_FILE_CONF_SUFFIX") | ||
| .orElse(maybeServiceAccountCaCert.map(_.getAbsolutePath)) | ||
| val clientKeyFile = sparkConf | ||
| .getOption(s"$kubernetesAuthConfPrefix.$CLIENT_KEY_FILE_CONF_SUFFIX") | ||
| val clientCertFile = sparkConf | ||
| .getOption(s"$kubernetesAuthConfPrefix.$CLIENT_CERT_FILE_CONF_SUFFIX") | ||
| val dispatcher = new Dispatcher( | ||
| ThreadUtils.newDaemonCachedThreadPool("kubernetes-dispatcher")) | ||
| val config = new ConfigBuilder() | ||
| .withApiVersion("v1") | ||
| .withMasterUrl(master) | ||
| .withWebsocketPingInterval(0) | ||
| .withOption(oauthTokenValue) { | ||
| (token, configBuilder) => configBuilder.withOauthToken(token) | ||
| }.withOption(caCertFile) { | ||
| (file, configBuilder) => configBuilder.withCaCertFile(file) | ||
| }.withOption(clientKeyFile) { | ||
| (file, configBuilder) => configBuilder.withClientKeyFile(file) | ||
| }.withOption(clientCertFile) { | ||
| (file, configBuilder) => configBuilder.withClientCertFile(file) | ||
| }.withOption(namespace) { | ||
| (ns, configBuilder) => configBuilder.withNamespace(ns) | ||
| }.build() | ||
| val baseHttpClient = HttpClientUtils.createHttpClient(config) | ||
| val httpClientWithCustomDispatcher = baseHttpClient.newBuilder() | ||
| .dispatcher(dispatcher) | ||
| .build() | ||
| new DefaultKubernetesClient(httpClientWithCustomDispatcher, config) | ||
| } | ||
|
|
||
| private implicit class OptionConfigurableConfigBuilder(val configBuilder: ConfigBuilder) | ||
| extends AnyVal { | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -140,13 +140,6 @@ private[spark] class Client( | |
| throw e | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Why is this not needed anymore? If we enable cluster mode we still want the same behavior defined here right? There was a problem hiding this comment. mmh didn't change that behavior. Let's wait the next push and see the diff. master is evolving and numerous refactoring does not make this PR easy to merge with. There was a problem hiding this comment. Right, I have added back that section... Thx @tnachen |
||
| } | ||
| } | ||
|
|
||
|
|
||
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
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.
APISERVER_AUTH_DRIVER_MOUNTED_CONF_PREFIXwas replaced byKUBERNETES_AUTH_DRIVER_MOUNTED_CONF_PREFIX. Please revert this addition.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.
done