Skip to content

Commit de62f07

Browse files
committed
bump to 4.0.0 for kubernetes-client version
1 parent f83fedc commit de62f07

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

resource-managers/kubernetes/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<name>Spark Project Kubernetes</name>
3030
<properties>
3131
<sbt.project.name>kubernetes</sbt.project.name>
32-
<kubernetes.client.version>3.0.0</kubernetes.client.version>
32+
<kubernetes.client.version>4.0.0</kubernetes.client.version>
3333
</properties>
3434

3535
<dependencies>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.apache.spark.deploy.k8s
1818

1919
import scala.collection.JavaConverters._
2020

21-
import io.fabric8.kubernetes.api.model.{ContainerStateRunning, ContainerStateTerminated, ContainerStateWaiting, ContainerStatus, Pod, Time}
21+
import io.fabric8.kubernetes.api.model.{ContainerStateRunning, ContainerStateTerminated, ContainerStateWaiting, ContainerStatus, Pod}
2222

2323
import org.apache.spark.{SparkConf, SparkException}
2424
import org.apache.spark.util.Utils
@@ -157,7 +157,10 @@ private[spark] object KubernetesUtils {
157157
}.getOrElse(Seq(("container state", "N/A")))
158158
}
159159

160-
def formatTime(time: Time): String = {
161-
if (time != null) time.getTime else "N/A"
160+
def formatTime(time: String): String = {
161+
time match {
162+
case null => "N/A"
163+
case _ => time
164+
}
162165
}
163166
}

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ private[spark] class MountVolumesFeatureStep(
5656

5757
val volumeBuilder = spec.volumeConf match {
5858
case KubernetesHostPathVolumeConf(hostPath) =>
59+
// TODO: Backwards compatibility allows for empty string, but specify
60+
// hostPath type here
5961
new VolumeBuilder()
60-
.withHostPath(new HostPathVolumeSource(hostPath))
62+
.withHostPath(new HostPathVolumeSource(hostPath, ""))
6163

6264
case KubernetesPVCVolumeConf(claimName) =>
6365
new VolumeBuilder()

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/LoggingPodStatusWatcher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import java.util.concurrent.{CountDownLatch, TimeUnit}
2020

2121
import scala.collection.JavaConverters._
2222

23-
import io.fabric8.kubernetes.api.model.{ContainerStateRunning, ContainerStateTerminated, ContainerStateWaiting, ContainerStatus, Pod, Time}
23+
import io.fabric8.kubernetes.api.model.Pod
2424
import io.fabric8.kubernetes.client.{KubernetesClientException, Watcher}
2525
import io.fabric8.kubernetes.client.Watcher.Action
2626

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ object ExecutorLifecycleTestUtils {
8282
def deletedExecutor(executorId: Long): Pod = {
8383
new PodBuilder(podWithAttachedContainerForId(executorId))
8484
.editOrNewMetadata()
85-
.withNewDeletionTimestamp("523012521")
85+
.withDeletionTimestamp("523012521")
8686
.endMetadata()
8787
.build()
8888
}

resource-managers/kubernetes/integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
3030
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
3131
<extraScalaTestArgs></extraScalaTestArgs>
32-
<kubernetes-client.version>3.0.0</kubernetes-client.version>
32+
<kubernetes-client.version>4.0.0</kubernetes-client.version>
3333
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
3434
<scalatest-maven-plugin.version>1.0</scalatest-maven-plugin.version>
3535
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>

0 commit comments

Comments
 (0)