From 03f57828d1a327bab390046e1e6abd0da9914640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Wed, 10 Jan 2024 16:49:57 -0800 Subject: [PATCH] [SPARK-46662][K8S][BUILD] Upgrade `kubernetes-client` to 6.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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](https://github.com/fabric8io/kubernetes-client/pull/5587) [Upgrade Kubernetes Model to Kubernetes v1.29.0](https://github.com/fabric8io/kubernetes-client/pull/5686) No. Pass GA No. Closes #44672 from bjornjorgensen/kubclient6.10. Authored-by: Bjørn Jørgensen Signed-off-by: Dongjoon Hyun --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 50 +++++++++---------- pom.xml | 2 +- .../features/MountVolumesFeatureStep.scala | 2 +- .../k8s/ExecutorLifecycleTestUtils.scala | 2 +- .../k8s/integrationtest/PVTestsSuite.scala | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index ab89d538ad360..5ada6a843f51c 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -146,31 +146,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar jul-to-slf4j/2.0.6//jul-to-slf4j-2.0.6.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 diff --git a/pom.xml b/pom.xml index b0338e6e3cd42..f82db74a38548 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ 0.2.3 org.fusesource.leveldbjni - 6.9.1 + 6.10.0 ${java.home} diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala index 13e1b633415c4..a490a0c98b032 100644 --- a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala +++ b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala @@ -97,7 +97,7 @@ private[spark] class MountVolumesFeatureStep(conf: KubernetesConf) .withNewSpec() .withStorageClassName(storageClass.get) .withAccessModes(accessMode) - .withResources(new ResourceRequirementsBuilder() + .withResources(new VolumeResourceRequirementsBuilder() .withRequests(Map("storage" -> new Quantity(size.get)).asJava).build()) .endSpec() .build()) diff --git a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala index e0e3a22cbf5cf..ab072b6c33e4b 100644 --- a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala +++ b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorLifecycleTestUtils.scala @@ -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() diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala index 757847608d93e..84744b49e64b9 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala @@ -64,7 +64,7 @@ private[spark] trait PVTestsSuite { k8sSuite: KubernetesSuite => .withNewSpec() .withAccessModes("ReadWriteOnce") .withStorageClassName(storageClassName) - .withResources(new ResourceRequirementsBuilder() + .withResources(new VolumeResourceRequirementsBuilder() .withRequests(Map("storage" -> new Quantity("1Gi")).asJava).build()) .endSpec()