Skip to content

Commit

Permalink
[SPARK-46662][K8S][BUILD] Upgrade kubernetes-client to 6.10.0
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
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)

### Why are the changes needed?

[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)

### Does this PR introduce _any_ user-facing change?
No.

### How was this patch tested?
Pass GA

### Was this patch authored or co-authored using generative AI tooling?
No.

Closes #44672 from bjornjorgensen/kubclient6.10.

Authored-by: Bjørn Jørgensen <bjornjorgensen@gmail.com>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
  • Loading branch information
bjornjorgensen authored and dongjoon-hyun committed Jan 11, 2024
1 parent 4653d50 commit dcfd37c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
50 changes: 25 additions & 25 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
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
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
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
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
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

0 comments on commit dcfd37c

Please sign in to comment.