Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit a0761e8

Browse files
dongjoon-hyunakirillov
authored andcommitted
[SPARK-31786][K8S][BUILD] Upgrade kubernetes-client to 4.9.2
### What changes were proposed in this pull request? This PR aims to upgrade `kubernetes-client` library to bring the JDK8 related fixes. Please note that JDK11 works fine without any problem. - https://github.com/fabric8io/kubernetes-client/releases/tag/v4.9.2 - JDK8 always uses http/1.1 protocol (Prevent OkHttp from wrongly enabling http/2) ### Why are the changes needed? OkHttp "wrongly" detects the Platform as Jdk9Platform on JDK 8u251. - fabric8io/kubernetes-client#2212 - https://stackoverflow.com/questions/61565751/why-am-i-not-able-to-run-sparkpi-example-on-a-kubernetes-k8s-cluster Although there is a workaround `export HTTP2_DISABLE=true` and `Downgrade JDK or K8s`, we had better avoid this problematic situation. ### Does this PR introduce _any_ user-facing change? No. This will recover the failures on JDK 8u252. ### How was this patch tested? - [x] Pass the Jenkins UT (apache#28601 (comment)) - [x] Pass the Jenkins K8S IT with the K8s 1.13 (apache#28601 (comment)) - [x] Manual testing with K8s 1.17.3. (Below) **v1.17.6 result (on Minikube)** ``` KubernetesSuite: - Run SparkPi with no resources - Run SparkPi with a very long application name. - Use SparkLauncher.NO_RESOURCE - Run SparkPi with a master URL without a scheme. - Run SparkPi with an argument. - Run SparkPi with custom labels, annotations, and environment variables. - All pods have the same service account by default - Run extraJVMOptions check on driver - Run SparkRemoteFileTest using a remote data file - Run SparkPi with env and mount secrets. - Run PySpark on simple pi.py example - Run PySpark with Python2 to test a pyfiles example - Run PySpark with Python3 to test a pyfiles example - Run PySpark with memory customization - Run in client mode. - Start pod creation from template - PVs with local storage - Launcher client dependencies - Test basic decommissioning Run completed in 8 minutes, 27 seconds. Total number of tests run: 19 Suites: completed 2, aborted 0 Tests: succeeded 19, failed 0, canceled 0, ignored 0, pending 0 All tests passed. ``` Closes apache#28601 from dongjoon-hyun/SPARK-K8S-CLIENT. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 51eb629 commit a0761e8

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

dev/deps/spark-deps-hadoop-2.7-hive-1.2

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
9393
jackson-core/2.10.0//jackson-core-2.10.0.jar
9494
jackson-databind/2.10.0//jackson-databind-2.10.0.jar
9595
jackson-dataformat-yaml/2.10.0//jackson-dataformat-yaml-2.10.0.jar
96+
jackson-datatype-jsr310/2.10.3//jackson-datatype-jsr310-2.10.3.jar
9697
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
9798
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
9899
jackson-module-jaxb-annotations/2.10.0//jackson-module-jaxb-annotations-2.10.0.jar
@@ -137,9 +138,9 @@ jsr305/3.0.0//jsr305-3.0.0.jar
137138
jta/1.1//jta-1.1.jar
138139
jul-to-slf4j/1.7.16//jul-to-slf4j-1.7.16.jar
139140
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
140-
kubernetes-client/4.7.1//kubernetes-client-4.7.1.jar
141-
kubernetes-model-common/4.7.1//kubernetes-model-common-4.7.1.jar
142-
kubernetes-model/4.7.1//kubernetes-model-4.7.1.jar
141+
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
142+
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
143+
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
143144
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
144145
libfb303/0.9.3//libfb303-0.9.3.jar
145146
libthrift/0.12.0//libthrift-0.12.0.jar

dev/deps/spark-deps-hadoop-2.7-hive-2.3

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
107107
jackson-core/2.10.0//jackson-core-2.10.0.jar
108108
jackson-databind/2.10.0//jackson-databind-2.10.0.jar
109109
jackson-dataformat-yaml/2.10.0//jackson-dataformat-yaml-2.10.0.jar
110+
jackson-datatype-jsr310/2.10.3//jackson-datatype-jsr310-2.10.3.jar
110111
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
111112
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
112113
jackson-module-jaxb-annotations/2.10.0//jackson-module-jaxb-annotations-2.10.0.jar
@@ -153,9 +154,9 @@ jsr305/3.0.0//jsr305-3.0.0.jar
153154
jta/1.1//jta-1.1.jar
154155
jul-to-slf4j/1.7.16//jul-to-slf4j-1.7.16.jar
155156
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
156-
kubernetes-client/4.7.1//kubernetes-client-4.7.1.jar
157-
kubernetes-model-common/4.7.1//kubernetes-model-common-4.7.1.jar
158-
kubernetes-model/4.7.1//kubernetes-model-4.7.1.jar
157+
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
158+
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
159+
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
159160
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
160161
libfb303/0.9.3//libfb303-0.9.3.jar
161162
libthrift/0.12.0//libthrift-0.12.0.jar

dev/deps/spark-deps-hadoop-3.2-hive-2.3

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
106106
jackson-core/2.10.0//jackson-core-2.10.0.jar
107107
jackson-databind/2.10.0//jackson-databind-2.10.0.jar
108108
jackson-dataformat-yaml/2.10.0//jackson-dataformat-yaml-2.10.0.jar
109+
jackson-datatype-jsr310/2.10.3//jackson-datatype-jsr310-2.10.3.jar
109110
jackson-jaxrs-base/2.9.5//jackson-jaxrs-base-2.9.5.jar
110111
jackson-jaxrs-json-provider/2.9.5//jackson-jaxrs-json-provider-2.9.5.jar
111112
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
@@ -165,9 +166,9 @@ kerby-pkix/1.0.1//kerby-pkix-1.0.1.jar
165166
kerby-util/1.0.1//kerby-util-1.0.1.jar
166167
kerby-xdr/1.0.1//kerby-xdr-1.0.1.jar
167168
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
168-
kubernetes-client/4.7.1//kubernetes-client-4.7.1.jar
169-
kubernetes-model-common/4.7.1//kubernetes-model-common-4.7.1.jar
170-
kubernetes-model/4.7.1//kubernetes-model-4.7.1.jar
169+
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
170+
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
171+
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
171172
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
172173
libfb303/0.9.3//libfb303-0.9.3.jar
173174
libthrift/0.12.0//libthrift-0.12.0.jar

resource-managers/kubernetes/core/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<name>Spark Project Kubernetes</name>
3030
<properties>
3131
<sbt.project.name>kubernetes</sbt.project.name>
32-
<kubernetes.client.version>4.7.1</kubernetes.client.version>
32+
<!-- Note: Please update the kubernetes client version in kubernetes/integration-tests/pom.xml -->
33+
<kubernetes.client.version>4.9.2</kubernetes.client.version>
3334
</properties>
3435

3536
<dependencies>

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>4.6.1</kubernetes-client.version>
32+
<kubernetes-client.version>4.9.2</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)