This is an automated email from the ASF dual-hosted git repository.
dongjoon 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 76a134ade60 [SPARK-42148][K8S][BUILD] Upgrade `kubernetes-client` to
6.4.0
76a134ade60 is described below
commit 76a134ade60a9f354aca01eaca0b2e2477c6bd43
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Sat Jan 21 12:07:26 2023 -0800
[SPARK-42148][K8S][BUILD] Upgrade `kubernetes-client` to 6.4.0
### What changes were proposed in this pull request?
This PR aims to upgrade `kubernetes-client` to 6.4.0 for Apache Spark 3.4.
### Why are the changes needed?
To bring the latest patches and bug fixes.
- https://github.com/fabric8io/kubernetes-client/releases/tag/v6.4.0
### Does this PR introduce _any_ user-facing change?
No. Apache Spark 3.4 is not released yet.
### How was this patch tested?
Pass the CIs
Closes #39689 from dongjoon-hyun/SPARK-42148.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
dev/deps/spark-deps-hadoop-2-hive-2.3 | 48 +++++++++++-----------
dev/deps/spark-deps-hadoop-3-hive-2.3 | 48 +++++++++++-----------
pom.xml | 2 +-
.../apache/spark/deploy/k8s/KubernetesUtils.scala | 2 +-
.../deploy/k8s/features/VolcanoFeatureStep.scala | 2 +-
.../apache/spark/deploy/k8s/PodBuilderSuite.scala | 2 +-
6 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3
b/dev/deps/spark-deps-hadoop-2-hive-2.3
index 8868d8e8d2d..3aa529eb199 100644
--- a/dev/deps/spark-deps-hadoop-2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2-hive-2.3
@@ -159,30 +159,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/2.0.6//jul-to-slf4j-2.0.6.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
-kubernetes-client-api/6.3.1//kubernetes-client-api-6.3.1.jar
-kubernetes-client/6.3.1//kubernetes-client-6.3.1.jar
-kubernetes-httpclient-okhttp/6.3.1//kubernetes-httpclient-okhttp-6.3.1.jar
-kubernetes-model-admissionregistration/6.3.1//kubernetes-model-admissionregistration-6.3.1.jar
-kubernetes-model-apiextensions/6.3.1//kubernetes-model-apiextensions-6.3.1.jar
-kubernetes-model-apps/6.3.1//kubernetes-model-apps-6.3.1.jar
-kubernetes-model-autoscaling/6.3.1//kubernetes-model-autoscaling-6.3.1.jar
-kubernetes-model-batch/6.3.1//kubernetes-model-batch-6.3.1.jar
-kubernetes-model-certificates/6.3.1//kubernetes-model-certificates-6.3.1.jar
-kubernetes-model-common/6.3.1//kubernetes-model-common-6.3.1.jar
-kubernetes-model-coordination/6.3.1//kubernetes-model-coordination-6.3.1.jar
-kubernetes-model-core/6.3.1//kubernetes-model-core-6.3.1.jar
-kubernetes-model-discovery/6.3.1//kubernetes-model-discovery-6.3.1.jar
-kubernetes-model-events/6.3.1//kubernetes-model-events-6.3.1.jar
-kubernetes-model-extensions/6.3.1//kubernetes-model-extensions-6.3.1.jar
-kubernetes-model-flowcontrol/6.3.1//kubernetes-model-flowcontrol-6.3.1.jar
-kubernetes-model-gatewayapi/6.3.1//kubernetes-model-gatewayapi-6.3.1.jar
-kubernetes-model-metrics/6.3.1//kubernetes-model-metrics-6.3.1.jar
-kubernetes-model-networking/6.3.1//kubernetes-model-networking-6.3.1.jar
-kubernetes-model-node/6.3.1//kubernetes-model-node-6.3.1.jar
-kubernetes-model-policy/6.3.1//kubernetes-model-policy-6.3.1.jar
-kubernetes-model-rbac/6.3.1//kubernetes-model-rbac-6.3.1.jar
-kubernetes-model-scheduling/6.3.1//kubernetes-model-scheduling-6.3.1.jar
-kubernetes-model-storageclass/6.3.1//kubernetes-model-storageclass-6.3.1.jar
+kubernetes-client-api/6.4.0//kubernetes-client-api-6.4.0.jar
+kubernetes-client/6.4.0//kubernetes-client-6.4.0.jar
+kubernetes-httpclient-okhttp/6.4.0//kubernetes-httpclient-okhttp-6.4.0.jar
+kubernetes-model-admissionregistration/6.4.0//kubernetes-model-admissionregistration-6.4.0.jar
+kubernetes-model-apiextensions/6.4.0//kubernetes-model-apiextensions-6.4.0.jar
+kubernetes-model-apps/6.4.0//kubernetes-model-apps-6.4.0.jar
+kubernetes-model-autoscaling/6.4.0//kubernetes-model-autoscaling-6.4.0.jar
+kubernetes-model-batch/6.4.0//kubernetes-model-batch-6.4.0.jar
+kubernetes-model-certificates/6.4.0//kubernetes-model-certificates-6.4.0.jar
+kubernetes-model-common/6.4.0//kubernetes-model-common-6.4.0.jar
+kubernetes-model-coordination/6.4.0//kubernetes-model-coordination-6.4.0.jar
+kubernetes-model-core/6.4.0//kubernetes-model-core-6.4.0.jar
+kubernetes-model-discovery/6.4.0//kubernetes-model-discovery-6.4.0.jar
+kubernetes-model-events/6.4.0//kubernetes-model-events-6.4.0.jar
+kubernetes-model-extensions/6.4.0//kubernetes-model-extensions-6.4.0.jar
+kubernetes-model-flowcontrol/6.4.0//kubernetes-model-flowcontrol-6.4.0.jar
+kubernetes-model-gatewayapi/6.4.0//kubernetes-model-gatewayapi-6.4.0.jar
+kubernetes-model-metrics/6.4.0//kubernetes-model-metrics-6.4.0.jar
+kubernetes-model-networking/6.4.0//kubernetes-model-networking-6.4.0.jar
+kubernetes-model-node/6.4.0//kubernetes-model-node-6.4.0.jar
+kubernetes-model-policy/6.4.0//kubernetes-model-policy-6.4.0.jar
+kubernetes-model-rbac/6.4.0//kubernetes-model-rbac-6.4.0.jar
+kubernetes-model-scheduling/6.4.0//kubernetes-model-scheduling-6.4.0.jar
+kubernetes-model-storageclass/6.4.0//kubernetes-model-storageclass-6.4.0.jar
lapack/3.0.3//lapack-3.0.3.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3
b/dev/deps/spark-deps-hadoop-3-hive-2.3
index fd034c054f8..c1f5dee6763 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -143,30 +143,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/2.0.6//jul-to-slf4j-2.0.6.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
-kubernetes-client-api/6.3.1//kubernetes-client-api-6.3.1.jar
-kubernetes-client/6.3.1//kubernetes-client-6.3.1.jar
-kubernetes-httpclient-okhttp/6.3.1//kubernetes-httpclient-okhttp-6.3.1.jar
-kubernetes-model-admissionregistration/6.3.1//kubernetes-model-admissionregistration-6.3.1.jar
-kubernetes-model-apiextensions/6.3.1//kubernetes-model-apiextensions-6.3.1.jar
-kubernetes-model-apps/6.3.1//kubernetes-model-apps-6.3.1.jar
-kubernetes-model-autoscaling/6.3.1//kubernetes-model-autoscaling-6.3.1.jar
-kubernetes-model-batch/6.3.1//kubernetes-model-batch-6.3.1.jar
-kubernetes-model-certificates/6.3.1//kubernetes-model-certificates-6.3.1.jar
-kubernetes-model-common/6.3.1//kubernetes-model-common-6.3.1.jar
-kubernetes-model-coordination/6.3.1//kubernetes-model-coordination-6.3.1.jar
-kubernetes-model-core/6.3.1//kubernetes-model-core-6.3.1.jar
-kubernetes-model-discovery/6.3.1//kubernetes-model-discovery-6.3.1.jar
-kubernetes-model-events/6.3.1//kubernetes-model-events-6.3.1.jar
-kubernetes-model-extensions/6.3.1//kubernetes-model-extensions-6.3.1.jar
-kubernetes-model-flowcontrol/6.3.1//kubernetes-model-flowcontrol-6.3.1.jar
-kubernetes-model-gatewayapi/6.3.1//kubernetes-model-gatewayapi-6.3.1.jar
-kubernetes-model-metrics/6.3.1//kubernetes-model-metrics-6.3.1.jar
-kubernetes-model-networking/6.3.1//kubernetes-model-networking-6.3.1.jar
-kubernetes-model-node/6.3.1//kubernetes-model-node-6.3.1.jar
-kubernetes-model-policy/6.3.1//kubernetes-model-policy-6.3.1.jar
-kubernetes-model-rbac/6.3.1//kubernetes-model-rbac-6.3.1.jar
-kubernetes-model-scheduling/6.3.1//kubernetes-model-scheduling-6.3.1.jar
-kubernetes-model-storageclass/6.3.1//kubernetes-model-storageclass-6.3.1.jar
+kubernetes-client-api/6.4.0//kubernetes-client-api-6.4.0.jar
+kubernetes-client/6.4.0//kubernetes-client-6.4.0.jar
+kubernetes-httpclient-okhttp/6.4.0//kubernetes-httpclient-okhttp-6.4.0.jar
+kubernetes-model-admissionregistration/6.4.0//kubernetes-model-admissionregistration-6.4.0.jar
+kubernetes-model-apiextensions/6.4.0//kubernetes-model-apiextensions-6.4.0.jar
+kubernetes-model-apps/6.4.0//kubernetes-model-apps-6.4.0.jar
+kubernetes-model-autoscaling/6.4.0//kubernetes-model-autoscaling-6.4.0.jar
+kubernetes-model-batch/6.4.0//kubernetes-model-batch-6.4.0.jar
+kubernetes-model-certificates/6.4.0//kubernetes-model-certificates-6.4.0.jar
+kubernetes-model-common/6.4.0//kubernetes-model-common-6.4.0.jar
+kubernetes-model-coordination/6.4.0//kubernetes-model-coordination-6.4.0.jar
+kubernetes-model-core/6.4.0//kubernetes-model-core-6.4.0.jar
+kubernetes-model-discovery/6.4.0//kubernetes-model-discovery-6.4.0.jar
+kubernetes-model-events/6.4.0//kubernetes-model-events-6.4.0.jar
+kubernetes-model-extensions/6.4.0//kubernetes-model-extensions-6.4.0.jar
+kubernetes-model-flowcontrol/6.4.0//kubernetes-model-flowcontrol-6.4.0.jar
+kubernetes-model-gatewayapi/6.4.0//kubernetes-model-gatewayapi-6.4.0.jar
+kubernetes-model-metrics/6.4.0//kubernetes-model-metrics-6.4.0.jar
+kubernetes-model-networking/6.4.0//kubernetes-model-networking-6.4.0.jar
+kubernetes-model-node/6.4.0//kubernetes-model-node-6.4.0.jar
+kubernetes-model-policy/6.4.0//kubernetes-model-policy-6.4.0.jar
+kubernetes-model-rbac/6.4.0//kubernetes-model-rbac-6.4.0.jar
+kubernetes-model-scheduling/6.4.0//kubernetes-model-scheduling-6.4.0.jar
+kubernetes-model-storageclass/6.4.0//kubernetes-model-storageclass-6.4.0.jar
lapack/3.0.3//lapack-3.0.3.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
diff --git a/pom.xml b/pom.xml
index 0e01211fc83..ed4df8b8dbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
<arrow.version>10.0.1</arrow.version>
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
- <kubernetes-client.version>6.3.1</kubernetes-client.version>
+ <kubernetes-client.version>6.4.0</kubernetes-client.version>
<test.java.home>${java.home}</test.java.home>
diff --git
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesUtils.scala
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesUtils.scala
index bbabd680c1a..0b9b1f85fb4 100644
---
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesUtils.scala
+++
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesUtils.scala
@@ -102,7 +102,7 @@ object KubernetesUtils extends Logging {
val hadoopConf = SparkHadoopUtil.get.newConfiguration(conf)
val localFile = downloadFile(templateFileName, Utils.createTempDir(),
conf, hadoopConf)
val templateFile = new File(new java.net.URI(localFile).getPath)
- val pod = kubernetesClient.pods().load(templateFile).get()
+ val pod = kubernetesClient.pods().load(templateFile).item()
selectSparkContainer(pod, containerName)
} catch {
case e: Exception =>
diff --git
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala
index ab84393dd5d..1a06f7ee0bf 100644
---
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala
+++
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala
@@ -48,7 +48,7 @@ private[spark] class VolcanoFeatureStep extends
KubernetesDriverCustomFeatureCon
}
val client = new DefaultVolcanoClient
val template = kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY)
- val pg = template.map(client.podGroups.load(_).get).getOrElse(new
PodGroup())
+ val pg = template.map(client.podGroups.load(_).item).getOrElse(new
PodGroup())
var metadata = pg.getMetadata
if (metadata == null) metadata = new ObjectMeta
metadata.setName(podGroupName)
diff --git
a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/PodBuilderSuite.scala
b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/PodBuilderSuite.scala
index dc2d354af98..19413f10c23 100644
---
a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/PodBuilderSuite.scala
+++
b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/PodBuilderSuite.scala
@@ -161,7 +161,7 @@ abstract class PodBuilderSuite extends SparkFunSuite {
val podResource = mock(classOf[PodResource])
when(kubernetesClient.pods()).thenReturn(pods)
when(pods.load(any(classOf[File]))).thenReturn(podResource)
- when(podResource.get()).thenReturn(pod)
+ when(podResource.item()).thenReturn(pod)
kubernetesClient
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
