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.

Sign up for GitHub

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-46662][K8S][BUILD] Upgrade kubernetes-client to 6.10.0 #44672

Closed
wants to merge 4 commits into from
+29 −29
Closed

[SPARK-46662][K8S][BUILD] Upgrade kubernetes-client to 6.10.0 #44672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98ad48f
./dev/test-dependencies.sh --replace-manifest
bjornjorgensen Jan 10, 2024
63641a9
change ResourceRequirements to VolumeResourceRequirements
bjornjorgensen Jan 10, 2024
547ffc9
more ResourceRequirements to VolumeResourceRequirements
bjornjorgensen Jan 10, 2024
283f253
more VolumeResourceRequirements
bjornjorgensen Jan 10, 2024
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
50 changes: 25 additions & 25 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,31 +148,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/2.0.10//jul-to-slf4j-2.0.10.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
kubernetes-client-api/6.9.1//kubernetes-client-api-6.9.1.jar
kubernetes-client/6.9.1//kubernetes-client-6.9.1.jar
kubernetes-httpclient-okhttp/6.9.1//kubernetes-httpclient-okhttp-6.9.1.jar
kubernetes-model-admissionregistration/6.9.1//kubernetes-model-admissionregistration-6.9.1.jar
kubernetes-model-apiextensions/6.9.1//kubernetes-model-apiextensions-6.9.1.jar
kubernetes-model-apps/6.9.1//kubernetes-model-apps-6.9.1.jar
kubernetes-model-autoscaling/6.9.1//kubernetes-model-autoscaling-6.9.1.jar
kubernetes-model-batch/6.9.1//kubernetes-model-batch-6.9.1.jar
kubernetes-model-certificates/6.9.1//kubernetes-model-certificates-6.9.1.jar
kubernetes-model-common/6.9.1//kubernetes-model-common-6.9.1.jar
kubernetes-model-coordination/6.9.1//kubernetes-model-coordination-6.9.1.jar
kubernetes-model-core/6.9.1//kubernetes-model-core-6.9.1.jar
kubernetes-model-discovery/6.9.1//kubernetes-model-discovery-6.9.1.jar
kubernetes-model-events/6.9.1//kubernetes-model-events-6.9.1.jar
kubernetes-model-extensions/6.9.1//kubernetes-model-extensions-6.9.1.jar
kubernetes-model-flowcontrol/6.9.1//kubernetes-model-flowcontrol-6.9.1.jar
kubernetes-model-gatewayapi/6.9.1//kubernetes-model-gatewayapi-6.9.1.jar
kubernetes-model-metrics/6.9.1//kubernetes-model-metrics-6.9.1.jar
kubernetes-model-networking/6.9.1//kubernetes-model-networking-6.9.1.jar
kubernetes-model-node/6.9.1//kubernetes-model-node-6.9.1.jar
kubernetes-model-policy/6.9.1//kubernetes-model-policy-6.9.1.jar
kubernetes-model-rbac/6.9.1//kubernetes-model-rbac-6.9.1.jar
kubernetes-model-resource/6.9.1//kubernetes-model-resource-6.9.1.jar
kubernetes-model-scheduling/6.9.1//kubernetes-model-scheduling-6.9.1.jar
kubernetes-model-storageclass/6.9.1//kubernetes-model-storageclass-6.9.1.jar
kubernetes-client-api/6.10.0//kubernetes-client-api-6.10.0.jar
kubernetes-client/6.10.0//kubernetes-client-6.10.0.jar
kubernetes-httpclient-okhttp/6.10.0//kubernetes-httpclient-okhttp-6.10.0.jar
kubernetes-model-admissionregistration/6.10.0//kubernetes-model-admissionregistration-6.10.0.jar
kubernetes-model-apiextensions/6.10.0//kubernetes-model-apiextensions-6.10.0.jar
kubernetes-model-apps/6.10.0//kubernetes-model-apps-6.10.0.jar
kubernetes-model-autoscaling/6.10.0//kubernetes-model-autoscaling-6.10.0.jar
kubernetes-model-batch/6.10.0//kubernetes-model-batch-6.10.0.jar
kubernetes-model-certificates/6.10.0//kubernetes-model-certificates-6.10.0.jar
kubernetes-model-common/6.10.0//kubernetes-model-common-6.10.0.jar
kubernetes-model-coordination/6.10.0//kubernetes-model-coordination-6.10.0.jar
kubernetes-model-core/6.10.0//kubernetes-model-core-6.10.0.jar
kubernetes-model-discovery/6.10.0//kubernetes-model-discovery-6.10.0.jar
kubernetes-model-events/6.10.0//kubernetes-model-events-6.10.0.jar
kubernetes-model-extensions/6.10.0//kubernetes-model-extensions-6.10.0.jar
kubernetes-model-flowcontrol/6.10.0//kubernetes-model-flowcontrol-6.10.0.jar
kubernetes-model-gatewayapi/6.10.0//kubernetes-model-gatewayapi-6.10.0.jar
kubernetes-model-metrics/6.10.0//kubernetes-model-metrics-6.10.0.jar
kubernetes-model-networking/6.10.0//kubernetes-model-networking-6.10.0.jar
kubernetes-model-node/6.10.0//kubernetes-model-node-6.10.0.jar
kubernetes-model-policy/6.10.0//kubernetes-model-policy-6.10.0.jar
kubernetes-model-rbac/6.10.0//kubernetes-model-rbac-6.10.0.jar
kubernetes-model-resource/6.10.0//kubernetes-model-resource-6.10.0.jar
kubernetes-model-scheduling/6.10.0//kubernetes-model-scheduling-6.10.0.jar
kubernetes-model-storageclass/6.10.0//kubernetes-model-storageclass-6.10.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 Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
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.9.1</kubernetes-client.version>
<kubernetes-client.version>6.10.0</kubernetes-client.version>

<test.java.home>${java.home}</test.java.home>

Expand Down
2 changes: 1 addition & 1 deletion ...es/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private[spark] class MountVolumesFeatureStep(conf: KubernetesConf)
.withNewSpec()
.withStorageClassName(storageClass.get)
.withAccessModes(PVC_ACCESS_MODE)
.withResources(new ResourceRequirementsBuilder()
.withResources(new VolumeResourceRequirementsBuilder()
.withRequests(Map("storage" -> new Quantity(size.get)).asJava).build())
.endSpec()
.build())
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ object ExecutorLifecycleTestUtils {
.withNewSpec()
.withStorageClassName(storageClass)
.withAccessModes("ReadWriteOnce")
.withResources(new ResourceRequirementsBuilder()
.withResources(new VolumeResourceRequirementsBuilder()
.withRequests(Map("storage" -> new Quantity(size)).asJava).build())
.endSpec()
.build()
Expand Down
2 changes: 1 addition & 1 deletion ...ation-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private[spark] trait PVTestsSuite { k8sSuite: KubernetesSuite =>
.withNewSpec()
.withAccessModes("ReadWriteOnce")
.withStorageClassName("test-local-storage")
.withResources(new ResourceRequirementsBuilder()
.withResources(new VolumeResourceRequirementsBuilder()
.withRequests(Map("storage" -> new Quantity("1Gi")).asJava).build())
.endSpec()

Expand Down