Skip to content

Commit 2eb747d

Browse files
bjornjorgensenshubhluck
authored andcommitted
ODP-3237: [SPARK-46662][K8S][BUILD] Upgrade kubernetes-client to 6.10.0
Upgrade `kubernetes-client` from 6.9.1 to 6.10.0 [Release notes 6.10.0](https://github.com/fabric8io/kubernetes-client/releases/tag/v6.10.0) [Release notes 6.9.2](https://github.com/fabric8io/kubernetes-client/releases/tag/v6.9.2) [Updated okio to version 1.17.6 to avoid CVE-2023-3635](fabric8io/kubernetes-client#5587) [Upgrade Kubernetes Model to Kubernetes v1.29.0](fabric8io/kubernetes-client#5686) No. Pass GA No. Closes apache#44672 from bjornjorgensen/kubclient6.10. Authored-by: Bjørn Jørgensen <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit dcfd37c) (cherry picked from commit 4fe602b)
1 parent 910dd2e commit 2eb747d

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -148,31 +148,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar
148148
jta/1.1//jta-1.1.jar
149149
jul-to-slf4j/2.0.7//jul-to-slf4j-2.0.7.jar
150150
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
151-
kubernetes-client-api/6.9.1//kubernetes-client-api-6.9.1.jar
152-
kubernetes-client/6.9.1//kubernetes-client-6.9.1.jar
153-
kubernetes-httpclient-okhttp/6.9.1//kubernetes-httpclient-okhttp-6.9.1.jar
154-
kubernetes-model-admissionregistration/6.9.1//kubernetes-model-admissionregistration-6.9.1.jar
155-
kubernetes-model-apiextensions/6.9.1//kubernetes-model-apiextensions-6.9.1.jar
156-
kubernetes-model-apps/6.9.1//kubernetes-model-apps-6.9.1.jar
157-
kubernetes-model-autoscaling/6.9.1//kubernetes-model-autoscaling-6.9.1.jar
158-
kubernetes-model-batch/6.9.1//kubernetes-model-batch-6.9.1.jar
159-
kubernetes-model-certificates/6.9.1//kubernetes-model-certificates-6.9.1.jar
160-
kubernetes-model-common/6.9.1//kubernetes-model-common-6.9.1.jar
161-
kubernetes-model-coordination/6.9.1//kubernetes-model-coordination-6.9.1.jar
162-
kubernetes-model-core/6.9.1//kubernetes-model-core-6.9.1.jar
163-
kubernetes-model-discovery/6.9.1//kubernetes-model-discovery-6.9.1.jar
164-
kubernetes-model-events/6.9.1//kubernetes-model-events-6.9.1.jar
165-
kubernetes-model-extensions/6.9.1//kubernetes-model-extensions-6.9.1.jar
166-
kubernetes-model-flowcontrol/6.9.1//kubernetes-model-flowcontrol-6.9.1.jar
167-
kubernetes-model-gatewayapi/6.9.1//kubernetes-model-gatewayapi-6.9.1.jar
168-
kubernetes-model-metrics/6.9.1//kubernetes-model-metrics-6.9.1.jar
169-
kubernetes-model-networking/6.9.1//kubernetes-model-networking-6.9.1.jar
170-
kubernetes-model-node/6.9.1//kubernetes-model-node-6.9.1.jar
171-
kubernetes-model-policy/6.9.1//kubernetes-model-policy-6.9.1.jar
172-
kubernetes-model-rbac/6.9.1//kubernetes-model-rbac-6.9.1.jar
173-
kubernetes-model-resource/6.9.1//kubernetes-model-resource-6.9.1.jar
174-
kubernetes-model-scheduling/6.9.1//kubernetes-model-scheduling-6.9.1.jar
175-
kubernetes-model-storageclass/6.9.1//kubernetes-model-storageclass-6.9.1.jar
151+
kubernetes-client-api/6.10.0//kubernetes-client-api-6.10.0.jar
152+
kubernetes-client/6.10.0//kubernetes-client-6.10.0.jar
153+
kubernetes-httpclient-okhttp/6.10.0//kubernetes-httpclient-okhttp-6.10.0.jar
154+
kubernetes-model-admissionregistration/6.10.0//kubernetes-model-admissionregistration-6.10.0.jar
155+
kubernetes-model-apiextensions/6.10.0//kubernetes-model-apiextensions-6.10.0.jar
156+
kubernetes-model-apps/6.10.0//kubernetes-model-apps-6.10.0.jar
157+
kubernetes-model-autoscaling/6.10.0//kubernetes-model-autoscaling-6.10.0.jar
158+
kubernetes-model-batch/6.10.0//kubernetes-model-batch-6.10.0.jar
159+
kubernetes-model-certificates/6.10.0//kubernetes-model-certificates-6.10.0.jar
160+
kubernetes-model-common/6.10.0//kubernetes-model-common-6.10.0.jar
161+
kubernetes-model-coordination/6.10.0//kubernetes-model-coordination-6.10.0.jar
162+
kubernetes-model-core/6.10.0//kubernetes-model-core-6.10.0.jar
163+
kubernetes-model-discovery/6.10.0//kubernetes-model-discovery-6.10.0.jar
164+
kubernetes-model-events/6.10.0//kubernetes-model-events-6.10.0.jar
165+
kubernetes-model-extensions/6.10.0//kubernetes-model-extensions-6.10.0.jar
166+
kubernetes-model-flowcontrol/6.10.0//kubernetes-model-flowcontrol-6.10.0.jar
167+
kubernetes-model-gatewayapi/6.10.0//kubernetes-model-gatewayapi-6.10.0.jar
168+
kubernetes-model-metrics/6.10.0//kubernetes-model-metrics-6.10.0.jar
169+
kubernetes-model-networking/6.10.0//kubernetes-model-networking-6.10.0.jar
170+
kubernetes-model-node/6.10.0//kubernetes-model-node-6.10.0.jar
171+
kubernetes-model-policy/6.10.0//kubernetes-model-policy-6.10.0.jar
172+
kubernetes-model-rbac/6.10.0//kubernetes-model-rbac-6.10.0.jar
173+
kubernetes-model-resource/6.10.0//kubernetes-model-resource-6.10.0.jar
174+
kubernetes-model-scheduling/6.10.0//kubernetes-model-scheduling-6.10.0.jar
175+
kubernetes-model-storageclass/6.10.0//kubernetes-model-storageclass-6.10.0.jar
176176
lapack/3.0.3//lapack-3.0.3.jar
177177
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
178178
libfb303/0.9.3//libfb303-0.9.3.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229

230230
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
231231
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
232-
<kubernetes-client.version>6.9.1</kubernetes-client.version>
232+
<kubernetes-client.version>6.10.0</kubernetes-client.version>
233233
<okio.version>1.17.6</okio.version>
234234

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

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private[spark] class MountVolumesFeatureStep(conf: KubernetesConf)
9696
.withNewSpec()
9797
.withStorageClassName(storageClass.get)
9898
.withAccessModes(accessMode)
99-
.withResources(new ResourceRequirementsBuilder()
99+
.withResources(new VolumeResourceRequirementsBuilder()
100100
.withRequests(Map("storage" -> new Quantity(size.get)).asJava).build())
101101
.endSpec()
102102
.build())

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ object ExecutorLifecycleTestUtils {
261261
.withNewSpec()
262262
.withStorageClassName(storageClass)
263263
.withAccessModes("ReadWriteOnce")
264-
.withResources(new ResourceRequirementsBuilder()
264+
.withResources(new VolumeResourceRequirementsBuilder()
265265
.withRequests(Map("storage" -> new Quantity(size)).asJava).build())
266266
.endSpec()
267267
.build()

resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private[spark] trait PVTestsSuite { k8sSuite: KubernetesSuite =>
8989
.withNewSpec()
9090
.withAccessModes("ReadWriteOnce")
9191
.withStorageClassName("test-local-storage")
92-
.withResources(new ResourceRequirementsBuilder()
92+
.withResources(new VolumeResourceRequirementsBuilder()
9393
.withRequests(Map("storage" -> new Quantity("1Gi")).asJava).build())
9494
.endSpec()
9595

0 commit comments

Comments
 (0)