Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit c198d9f

Browse files
committed
initial sparkResource implementation
1 parent 1fd1633 commit c198d9f

File tree

10 files changed

+369
-363
lines changed

10 files changed

+369
-363
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
<dependency>
337337
<groupId>com.squareup.okhttp3</groupId>
338338
<artifactId>okhttp</artifactId>
339-
<version>3.4.1</version>
339+
<version>3.6.0</version>
340340
</dependency>
341341
<dependency>
342342
<groupId>org.bouncycastle</groupId>
Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import java.io.File
2020

2121
import com.google.common.base.Charsets
2222
import com.google.common.io.Files
23-
import io.fabric8.kubernetes.client.{Config, ConfigBuilder, DefaultKubernetesClient}
23+
import io.fabric8.kubernetes.client.{BaseClient, Config, ConfigBuilder, DefaultKubernetesClient}
24+
import okhttp3._
2425

2526
import org.apache.spark.deploy.kubernetes.constants._
2627

27-
private[spark] object KubernetesClientBuilder {
28+
private[spark] object ClientBuilder {
2829
private val API_SERVER_TOKEN = new File(Config.KUBERNETES_SERVICE_ACCOUNT_TOKEN_PATH)
2930
private val CA_CERT_FILE = new File(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH)
3031

@@ -34,7 +35,7 @@ private[spark] object KubernetesClientBuilder {
3435
* are picked up from canonical locations, as they are injected
3536
* into the pod's disk space.
3637
*/
37-
def buildFromWithinPod(
38+
def buildK8sClientFromWithinPod(
3839
kubernetesNamespace: String): DefaultKubernetesClient = {
3940
var clientConfigBuilder = new ConfigBuilder()
4041
.withApiVersion("v1")
@@ -51,4 +52,14 @@ private[spark] object KubernetesClientBuilder {
5152
}
5253
new DefaultKubernetesClient(clientConfigBuilder.build)
5354
}
55+
56+
def buildOkhttpClientFromWithinPod(client: BaseClient): OkHttpClient = {
57+
val field = classOf[BaseClient].getDeclaredField("httpClient")
58+
try {
59+
field.setAccessible(true)
60+
field.get(client).asInstanceOf[OkHttpClient]
61+
} finally {
62+
field.setAccessible(false)
63+
}
64+
}
5465
}

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/JobResourceCreateCall.scala

Lines changed: 0 additions & 41 deletions
This file was deleted.

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/SparkJobResource.scala

Lines changed: 0 additions & 306 deletions
This file was deleted.

0 commit comments

Comments
 (0)