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 895a1fc [SPARK-37237][K8S][BUILD] Upgrade kubernetes-client to 5.9.0
895a1fc is described below
commit 895a1fcb4b2be77370a3789f8a781f1ab0df807d
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Mon Nov 8 10:03:41 2021 -0800
[SPARK-37237][K8S][BUILD] Upgrade kubernetes-client to 5.9.0
### What changes were proposed in this pull request?
This PR aims to upgrade `kubenetes-client` from 5.8.0 to 5.9.0.
### Why are the changes needed?
This will bring the following bug fixes and improvement.
- https://github.com/fabric8io/kubernetes-client/releases/tag/v5.9.0
### Does this PR introduce _any_ user-facing change?
No. (The supported K8s versions are identical with 5.8.0).
To make Scala 2.13 compilation pass, the new `Action` type, `Bookmark`, is
handled in the test case.
- https://github.com/fabric8io/kubernetes-client/pull/3488
### How was this patch tested?
Pass the CIs.
Closes #34511 from dongjoon-hyun/SPARK-37237.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 44 +++++++++++-----------
dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 44 +++++++++++-----------
pom.xml | 2 +-
.../k8s/integrationtest/KubernetesSuite.scala | 2 +
4 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index 60756f7..6b77ddb 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -117,7 +117,7 @@ jackson-core/2.13.0//jackson-core-2.13.0.jar
jackson-databind/2.13.0//jackson-databind-2.13.0.jar
jackson-dataformat-cbor/2.13.0//jackson-dataformat-cbor-2.13.0.jar
jackson-dataformat-yaml/2.13.0//jackson-dataformat-yaml-2.13.0.jar
-jackson-datatype-jsr310/2.11.2//jackson-datatype-jsr310-2.11.2.jar
+jackson-datatype-jsr310/2.13.0//jackson-datatype-jsr310-2.13.0.jar
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
jackson-module-scala_2.12/2.13.0//jackson-module-scala_2.12-2.13.0.jar
@@ -161,27 +161,27 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
-kubernetes-client/5.8.0//kubernetes-client-5.8.0.jar
-kubernetes-model-admissionregistration/5.8.0//kubernetes-model-admissionregistration-5.8.0.jar
-kubernetes-model-apiextensions/5.8.0//kubernetes-model-apiextensions-5.8.0.jar
-kubernetes-model-apps/5.8.0//kubernetes-model-apps-5.8.0.jar
-kubernetes-model-autoscaling/5.8.0//kubernetes-model-autoscaling-5.8.0.jar
-kubernetes-model-batch/5.8.0//kubernetes-model-batch-5.8.0.jar
-kubernetes-model-certificates/5.8.0//kubernetes-model-certificates-5.8.0.jar
-kubernetes-model-common/5.8.0//kubernetes-model-common-5.8.0.jar
-kubernetes-model-coordination/5.8.0//kubernetes-model-coordination-5.8.0.jar
-kubernetes-model-core/5.8.0//kubernetes-model-core-5.8.0.jar
-kubernetes-model-discovery/5.8.0//kubernetes-model-discovery-5.8.0.jar
-kubernetes-model-events/5.8.0//kubernetes-model-events-5.8.0.jar
-kubernetes-model-extensions/5.8.0//kubernetes-model-extensions-5.8.0.jar
-kubernetes-model-flowcontrol/5.8.0//kubernetes-model-flowcontrol-5.8.0.jar
-kubernetes-model-metrics/5.8.0//kubernetes-model-metrics-5.8.0.jar
-kubernetes-model-networking/5.8.0//kubernetes-model-networking-5.8.0.jar
-kubernetes-model-node/5.8.0//kubernetes-model-node-5.8.0.jar
-kubernetes-model-policy/5.8.0//kubernetes-model-policy-5.8.0.jar
-kubernetes-model-rbac/5.8.0//kubernetes-model-rbac-5.8.0.jar
-kubernetes-model-scheduling/5.8.0//kubernetes-model-scheduling-5.8.0.jar
-kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar
+kubernetes-client/5.9.0//kubernetes-client-5.9.0.jar
+kubernetes-model-admissionregistration/5.9.0//kubernetes-model-admissionregistration-5.9.0.jar
+kubernetes-model-apiextensions/5.9.0//kubernetes-model-apiextensions-5.9.0.jar
+kubernetes-model-apps/5.9.0//kubernetes-model-apps-5.9.0.jar
+kubernetes-model-autoscaling/5.9.0//kubernetes-model-autoscaling-5.9.0.jar
+kubernetes-model-batch/5.9.0//kubernetes-model-batch-5.9.0.jar
+kubernetes-model-certificates/5.9.0//kubernetes-model-certificates-5.9.0.jar
+kubernetes-model-common/5.9.0//kubernetes-model-common-5.9.0.jar
+kubernetes-model-coordination/5.9.0//kubernetes-model-coordination-5.9.0.jar
+kubernetes-model-core/5.9.0//kubernetes-model-core-5.9.0.jar
+kubernetes-model-discovery/5.9.0//kubernetes-model-discovery-5.9.0.jar
+kubernetes-model-events/5.9.0//kubernetes-model-events-5.9.0.jar
+kubernetes-model-extensions/5.9.0//kubernetes-model-extensions-5.9.0.jar
+kubernetes-model-flowcontrol/5.9.0//kubernetes-model-flowcontrol-5.9.0.jar
+kubernetes-model-metrics/5.9.0//kubernetes-model-metrics-5.9.0.jar
+kubernetes-model-networking/5.9.0//kubernetes-model-networking-5.9.0.jar
+kubernetes-model-node/5.9.0//kubernetes-model-node-5.9.0.jar
+kubernetes-model-policy/5.9.0//kubernetes-model-policy-5.9.0.jar
+kubernetes-model-rbac/5.9.0//kubernetes-model-rbac-5.9.0.jar
+kubernetes-model-scheduling/5.9.0//kubernetes-model-scheduling-5.9.0.jar
+kubernetes-model-storageclass/5.9.0//kubernetes-model-storageclass-5.9.0.jar
lapack/2.2.0//lapack-2.2.0.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.2-hive-2.3
b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index acc4943..ad0674f 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -109,7 +109,7 @@ jackson-core/2.13.0//jackson-core-2.13.0.jar
jackson-databind/2.13.0//jackson-databind-2.13.0.jar
jackson-dataformat-cbor/2.13.0//jackson-dataformat-cbor-2.13.0.jar
jackson-dataformat-yaml/2.13.0//jackson-dataformat-yaml-2.13.0.jar
-jackson-datatype-jsr310/2.11.2//jackson-datatype-jsr310-2.11.2.jar
+jackson-datatype-jsr310/2.13.0//jackson-datatype-jsr310-2.13.0.jar
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
jackson-module-scala_2.12/2.13.0//jackson-module-scala_2.12-2.13.0.jar
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
@@ -148,27 +148,27 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
-kubernetes-client/5.8.0//kubernetes-client-5.8.0.jar
-kubernetes-model-admissionregistration/5.8.0//kubernetes-model-admissionregistration-5.8.0.jar
-kubernetes-model-apiextensions/5.8.0//kubernetes-model-apiextensions-5.8.0.jar
-kubernetes-model-apps/5.8.0//kubernetes-model-apps-5.8.0.jar
-kubernetes-model-autoscaling/5.8.0//kubernetes-model-autoscaling-5.8.0.jar
-kubernetes-model-batch/5.8.0//kubernetes-model-batch-5.8.0.jar
-kubernetes-model-certificates/5.8.0//kubernetes-model-certificates-5.8.0.jar
-kubernetes-model-common/5.8.0//kubernetes-model-common-5.8.0.jar
-kubernetes-model-coordination/5.8.0//kubernetes-model-coordination-5.8.0.jar
-kubernetes-model-core/5.8.0//kubernetes-model-core-5.8.0.jar
-kubernetes-model-discovery/5.8.0//kubernetes-model-discovery-5.8.0.jar
-kubernetes-model-events/5.8.0//kubernetes-model-events-5.8.0.jar
-kubernetes-model-extensions/5.8.0//kubernetes-model-extensions-5.8.0.jar
-kubernetes-model-flowcontrol/5.8.0//kubernetes-model-flowcontrol-5.8.0.jar
-kubernetes-model-metrics/5.8.0//kubernetes-model-metrics-5.8.0.jar
-kubernetes-model-networking/5.8.0//kubernetes-model-networking-5.8.0.jar
-kubernetes-model-node/5.8.0//kubernetes-model-node-5.8.0.jar
-kubernetes-model-policy/5.8.0//kubernetes-model-policy-5.8.0.jar
-kubernetes-model-rbac/5.8.0//kubernetes-model-rbac-5.8.0.jar
-kubernetes-model-scheduling/5.8.0//kubernetes-model-scheduling-5.8.0.jar
-kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar
+kubernetes-client/5.9.0//kubernetes-client-5.9.0.jar
+kubernetes-model-admissionregistration/5.9.0//kubernetes-model-admissionregistration-5.9.0.jar
+kubernetes-model-apiextensions/5.9.0//kubernetes-model-apiextensions-5.9.0.jar
+kubernetes-model-apps/5.9.0//kubernetes-model-apps-5.9.0.jar
+kubernetes-model-autoscaling/5.9.0//kubernetes-model-autoscaling-5.9.0.jar
+kubernetes-model-batch/5.9.0//kubernetes-model-batch-5.9.0.jar
+kubernetes-model-certificates/5.9.0//kubernetes-model-certificates-5.9.0.jar
+kubernetes-model-common/5.9.0//kubernetes-model-common-5.9.0.jar
+kubernetes-model-coordination/5.9.0//kubernetes-model-coordination-5.9.0.jar
+kubernetes-model-core/5.9.0//kubernetes-model-core-5.9.0.jar
+kubernetes-model-discovery/5.9.0//kubernetes-model-discovery-5.9.0.jar
+kubernetes-model-events/5.9.0//kubernetes-model-events-5.9.0.jar
+kubernetes-model-extensions/5.9.0//kubernetes-model-extensions-5.9.0.jar
+kubernetes-model-flowcontrol/5.9.0//kubernetes-model-flowcontrol-5.9.0.jar
+kubernetes-model-metrics/5.9.0//kubernetes-model-metrics-5.9.0.jar
+kubernetes-model-networking/5.9.0//kubernetes-model-networking-5.9.0.jar
+kubernetes-model-node/5.9.0//kubernetes-model-node-5.9.0.jar
+kubernetes-model-policy/5.9.0//kubernetes-model-policy-5.9.0.jar
+kubernetes-model-rbac/5.9.0//kubernetes-model-rbac-5.9.0.jar
+kubernetes-model-scheduling/5.9.0//kubernetes-model-scheduling-5.9.0.jar
+kubernetes-model-storageclass/5.9.0//kubernetes-model-storageclass-5.9.0.jar
lapack/2.2.0//lapack-2.2.0.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 42b4f3d..d4bb6b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
<arrow.version>2.0.0</arrow.version>
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
- <kubernetes-client.version>5.8.0</kubernetes-client.version>
+ <kubernetes-client.version>5.9.0</kubernetes-client.version>
<test.java.home>${java.home}</test.java.home>
diff --git
a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
index 06080ab..e608b3a 100644
---
a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
+++
b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
@@ -422,6 +422,8 @@ class KubernetesSuite extends SparkFunSuite
case Action.DELETED | Action.ERROR =>
execPods.remove(name)
podsDeleted += name
+ case Action.BOOKMARK =>
+ assert(false)
}
}
})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
