Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-50493][BUILD] Upgrade kubernetes-client to 7.0.0 #49066

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 41 additions & 29 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ janino/3.1.9//janino-3.1.9.jar
java-diff-utils/4.12//java-diff-utils-4.12.jar
java-xmlbuilder/1.2//java-xmlbuilder-1.2.jar
javassist/3.30.2-GA//javassist-3.30.2-GA.jar
javax.annotation-api/1.3.2//javax.annotation-api-1.3.2.jar
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
javax.servlet-api/4.0.1//javax.servlet-api-4.0.1.jar
javolution/5.5.1//javolution-5.5.1.jar
Expand Down Expand Up @@ -157,32 +158,37 @@ json4s-scalap_2.13/4.0.7//json4s-scalap_2.13-4.0.7.jar
jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/2.0.16//jul-to-slf4j-2.0.16.jar
kotlin-stdlib-common/1.8.21//kotlin-stdlib-common-1.8.21.jar
kotlin-stdlib-jdk7/1.8.21//kotlin-stdlib-jdk7-1.8.21.jar
kotlin-stdlib-jdk8/1.8.21//kotlin-stdlib-jdk8-1.8.21.jar
kotlin-stdlib/1.8.21//kotlin-stdlib-1.8.21.jar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, is this correct?

kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
kubernetes-client-api/6.13.4//kubernetes-client-api-6.13.4.jar
kubernetes-client/6.13.4//kubernetes-client-6.13.4.jar
kubernetes-httpclient-okhttp/6.13.4//kubernetes-httpclient-okhttp-6.13.4.jar
kubernetes-model-admissionregistration/6.13.4//kubernetes-model-admissionregistration-6.13.4.jar
kubernetes-model-apiextensions/6.13.4//kubernetes-model-apiextensions-6.13.4.jar
kubernetes-model-apps/6.13.4//kubernetes-model-apps-6.13.4.jar
kubernetes-model-autoscaling/6.13.4//kubernetes-model-autoscaling-6.13.4.jar
kubernetes-model-batch/6.13.4//kubernetes-model-batch-6.13.4.jar
kubernetes-model-certificates/6.13.4//kubernetes-model-certificates-6.13.4.jar
kubernetes-model-common/6.13.4//kubernetes-model-common-6.13.4.jar
kubernetes-model-coordination/6.13.4//kubernetes-model-coordination-6.13.4.jar
kubernetes-model-core/6.13.4//kubernetes-model-core-6.13.4.jar
kubernetes-model-discovery/6.13.4//kubernetes-model-discovery-6.13.4.jar
kubernetes-model-events/6.13.4//kubernetes-model-events-6.13.4.jar
kubernetes-model-extensions/6.13.4//kubernetes-model-extensions-6.13.4.jar
kubernetes-model-flowcontrol/6.13.4//kubernetes-model-flowcontrol-6.13.4.jar
kubernetes-model-gatewayapi/6.13.4//kubernetes-model-gatewayapi-6.13.4.jar
kubernetes-model-metrics/6.13.4//kubernetes-model-metrics-6.13.4.jar
kubernetes-model-networking/6.13.4//kubernetes-model-networking-6.13.4.jar
kubernetes-model-node/6.13.4//kubernetes-model-node-6.13.4.jar
kubernetes-model-policy/6.13.4//kubernetes-model-policy-6.13.4.jar
kubernetes-model-rbac/6.13.4//kubernetes-model-rbac-6.13.4.jar
kubernetes-model-resource/6.13.4//kubernetes-model-resource-6.13.4.jar
kubernetes-model-scheduling/6.13.4//kubernetes-model-scheduling-6.13.4.jar
kubernetes-model-storageclass/6.13.4//kubernetes-model-storageclass-6.13.4.jar
kubernetes-client-api/7.0.0//kubernetes-client-api-7.0.0.jar
kubernetes-client/7.0.0//kubernetes-client-7.0.0.jar
kubernetes-httpclient-okhttp/7.0.0//kubernetes-httpclient-okhttp-7.0.0.jar
kubernetes-httpclient-vertx/7.0.0//kubernetes-httpclient-vertx-7.0.0.jar
kubernetes-model-admissionregistration/7.0.0//kubernetes-model-admissionregistration-7.0.0.jar
kubernetes-model-apiextensions/7.0.0//kubernetes-model-apiextensions-7.0.0.jar
kubernetes-model-apps/7.0.0//kubernetes-model-apps-7.0.0.jar
kubernetes-model-autoscaling/7.0.0//kubernetes-model-autoscaling-7.0.0.jar
kubernetes-model-batch/7.0.0//kubernetes-model-batch-7.0.0.jar
kubernetes-model-certificates/7.0.0//kubernetes-model-certificates-7.0.0.jar
kubernetes-model-common/7.0.0//kubernetes-model-common-7.0.0.jar
kubernetes-model-coordination/7.0.0//kubernetes-model-coordination-7.0.0.jar
kubernetes-model-core/7.0.0//kubernetes-model-core-7.0.0.jar
kubernetes-model-discovery/7.0.0//kubernetes-model-discovery-7.0.0.jar
kubernetes-model-events/7.0.0//kubernetes-model-events-7.0.0.jar
kubernetes-model-extensions/7.0.0//kubernetes-model-extensions-7.0.0.jar
kubernetes-model-flowcontrol/7.0.0//kubernetes-model-flowcontrol-7.0.0.jar
kubernetes-model-gatewayapi/7.0.0//kubernetes-model-gatewayapi-7.0.0.jar
kubernetes-model-metrics/7.0.0//kubernetes-model-metrics-7.0.0.jar
kubernetes-model-networking/7.0.0//kubernetes-model-networking-7.0.0.jar
kubernetes-model-node/7.0.0//kubernetes-model-node-7.0.0.jar
kubernetes-model-policy/7.0.0//kubernetes-model-policy-7.0.0.jar
kubernetes-model-rbac/7.0.0//kubernetes-model-rbac-7.0.0.jar
kubernetes-model-resource/7.0.0//kubernetes-model-resource-7.0.0.jar
kubernetes-model-scheduling/7.0.0//kubernetes-model-scheduling-7.0.0.jar
kubernetes-model-storageclass/7.0.0//kubernetes-model-storageclass-7.0.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
Expand All @@ -193,7 +199,7 @@ log4j-api/2.24.2//log4j-api-2.24.2.jar
log4j-core/2.24.2//log4j-core-2.24.2.jar
log4j-layout-template-json/2.24.2//log4j-layout-template-json-2.24.2.jar
log4j-slf4j2-impl/2.24.2//log4j-slf4j2-impl-2.24.2.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
logging-interceptor/4.12.0//logging-interceptor-4.12.0.jar
lz4-java/1.8.0//lz4-java-1.8.0.jar
metrics-core/4.2.29//metrics-core-4.2.29.jar
metrics-graphite/4.2.29//metrics-graphite-4.2.29.jar
Expand All @@ -203,13 +209,15 @@ metrics-jvm/4.2.29//metrics-jvm-4.2.29.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.115.Final//netty-all-4.1.115.Final.jar
netty-buffer/4.1.115.Final//netty-buffer-4.1.115.Final.jar
netty-codec-dns/4.1.115.Final//netty-codec-dns-4.1.115.Final.jar
netty-codec-http/4.1.115.Final//netty-codec-http-4.1.115.Final.jar
netty-codec-http2/4.1.115.Final//netty-codec-http2-4.1.115.Final.jar
netty-codec-socks/4.1.115.Final//netty-codec-socks-4.1.115.Final.jar
netty-codec/4.1.115.Final//netty-codec-4.1.115.Final.jar
netty-common/4.1.115.Final//netty-common-4.1.115.Final.jar
netty-handler-proxy/4.1.115.Final//netty-handler-proxy-4.1.115.Final.jar
netty-handler/4.1.115.Final//netty-handler-4.1.115.Final.jar
netty-resolver-dns/4.1.115.Final//netty-resolver-dns-4.1.115.Final.jar
netty-resolver/4.1.115.Final//netty-resolver-4.1.115.Final.jar
netty-tcnative-boringssl-static/2.0.69.Final/linux-aarch_64/netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
netty-tcnative-boringssl-static/2.0.69.Final/linux-x86_64/netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
Expand All @@ -227,7 +235,7 @@ netty-transport-native-kqueue/4.1.115.Final/osx-x86_64/netty-transport-native-kq
netty-transport-native-unix-common/4.1.115.Final//netty-transport-native-unix-common-4.1.115.Final.jar
netty-transport/4.1.115.Final//netty-transport-4.1.115.Final.jar
objenesis/3.3//objenesis-3.3.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okhttp/4.12.0//okhttp-4.12.0.jar
Copy link
Member

@pan3793 pan3793 Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The K8s client "Switch default HTTP client from OkHttp to Vert.x" in fabric8io/kubernetes-client#6470

instead of upgrading OkHttp4 and pulling Kotlin runtime deps, maybe following the upstream to switch to Vert.x is a better option?

Copy link
Contributor Author

@panbingkun panbingkun Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! fine to me.
From 6.x to 7.x, we need to make some changes first, let's run GA first.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm +1 for @pan3793 's comment.

okio/1.17.6//okio-1.17.6.jar
opencsv/2.3//opencsv-2.3.jar
opentracing-api/0.33.0//opentracing-api-0.33.0.jar
Expand Down Expand Up @@ -258,7 +266,7 @@ scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
scala-reflect/2.13.15//scala-reflect-2.13.15.jar
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
slf4j-api/2.0.16//slf4j-api-2.0.16.jar
snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar
snakeyaml-engine/2.8//snakeyaml-engine-2.8.jar
snakeyaml/2.3//snakeyaml-2.3.jar
snappy-java/1.1.10.7//snappy-java-1.1.10.7.jar
spire-macros_2.13/0.18.0//spire-macros_2.13-0.18.0.jar
Expand All @@ -272,11 +280,15 @@ threeten-extra/1.7.1//threeten-extra-1.7.1.jar
tink/1.15.0//tink-1.15.0.jar
transaction-api/1.1//transaction-api-1.1.jar
univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
vertx-auth-common/4.5.11//vertx-auth-common-4.5.11.jar
vertx-core/4.5.11//vertx-core-4.5.11.jar
vertx-web-client/4.5.11//vertx-web-client-4.5.11.jar
vertx-web-common/4.5.11//vertx-web-common-4.5.11.jar
wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar
xbean-asm9-shaded/4.26//xbean-asm9-shaded-4.26.jar
xmlschema-core/2.3.1//xmlschema-core-2.3.1.jar
xz/1.10//xz-1.10.jar
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
zjsonpatch/7.0.0//zjsonpatch-7.0.0.jar
zookeeper-jute/3.9.3//zookeeper-jute-3.9.3.jar
zookeeper/3.9.3//zookeeper-3.9.3.jar
zstd-jni/1.5.6-8//zstd-jni-1.5.6-8.jar
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@

<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
<kubernetes-client.version>6.13.4</kubernetes-client.version>
<kubernetes-client.version>7.0.0</kubernetes-client.version>
<okio.version>1.17.6</okio.version>

<test.java.home>${java.home}</test.java.home>
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>volcano-model-v1beta1</artifactId>
<artifactId>volcano-model</artifactId>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

<version>${kubernetes-client.version}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package org.apache.spark.deploy.k8s.features

import io.fabric8.kubernetes.api.model._
import io.fabric8.volcano.api.model.scheduling.v1beta1.{PodGroup, PodGroupSpec}
import io.fabric8.volcano.client.DefaultVolcanoClient
import io.fabric8.volcano.scheduling.v1beta1.{PodGroup, PodGroupSpec}

import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesDriverConf, KubernetesExecutorConf, SparkPod}
import org.apache.spark.internal.Logging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package org.apache.spark.deploy.k8s.features

import java.io.File

import io.fabric8.volcano.scheduling.v1beta1.PodGroup
import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup

import org.apache.spark.{SparkConf, SparkFunSuite}
import org.apache.spark.deploy.k8s._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import scala.concurrent.Future
import scala.jdk.CollectionConverters._

import io.fabric8.kubernetes.api.model.{HasMetadata, Pod, Quantity}
import io.fabric8.volcano.api.model.scheduling.v1beta1.{Queue, QueueBuilder}
import io.fabric8.volcano.client.VolcanoClient
import io.fabric8.volcano.scheduling.v1beta1.{Queue, QueueBuilder}
import org.scalatest.BeforeAndAfterEach
import org.scalatest.concurrent.Eventually

Expand Down
Loading