From 5a49af07a7974e4196565c31bd88fb4f6bafd425 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Fri, 16 Dec 2022 12:59:29 -0800 Subject: [PATCH] [SPARK-41552][BUILD][K8S] Upgrade `kubernetes-client` to 6.3.1 ### What changes were proposed in this pull request? This PR aims to upgrade K8s client to 6.3.1. I tested manually that the regression is fixed. - https://github.com/fabric8io/kubernetes-client/releases/tag/v6.3.1 - https://github.com/fabric8io/kubernetes-client/releases/tag/v6.3.0 ### Why are the changes needed? SPARK-41521 tried to use 6.3.0, but it was reverted due to https://github.com/fabric8io/kubernetes-client/issues/4666. v6.3.1 fixed it. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the Cis. Closes #39094 from dongjoon-hyun/SPARK-41552. Authored-by: Dongjoon Hyun Signed-off-by: Dongjoon Hyun --- dev/deps/spark-deps-hadoop-2-hive-2.3 | 48 +++++++++++++-------------- dev/deps/spark-deps-hadoop-3-hive-2.3 | 48 +++++++++++++-------------- pom.xml | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3 b/dev/deps/spark-deps-hadoop-2-hive-2.3 index 40741e1d75b4..cfba3ef86d45 100644 --- a/dev/deps/spark-deps-hadoop-2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2-hive-2.3 @@ -159,30 +159,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar jul-to-slf4j/2.0.5//jul-to-slf4j-2.0.5.jar kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar -kubernetes-client-api/6.2.0//kubernetes-client-api-6.2.0.jar -kubernetes-client/6.2.0//kubernetes-client-6.2.0.jar -kubernetes-httpclient-okhttp/6.2.0//kubernetes-httpclient-okhttp-6.2.0.jar -kubernetes-model-admissionregistration/6.2.0//kubernetes-model-admissionregistration-6.2.0.jar -kubernetes-model-apiextensions/6.2.0//kubernetes-model-apiextensions-6.2.0.jar -kubernetes-model-apps/6.2.0//kubernetes-model-apps-6.2.0.jar -kubernetes-model-autoscaling/6.2.0//kubernetes-model-autoscaling-6.2.0.jar -kubernetes-model-batch/6.2.0//kubernetes-model-batch-6.2.0.jar -kubernetes-model-certificates/6.2.0//kubernetes-model-certificates-6.2.0.jar -kubernetes-model-common/6.2.0//kubernetes-model-common-6.2.0.jar -kubernetes-model-coordination/6.2.0//kubernetes-model-coordination-6.2.0.jar -kubernetes-model-core/6.2.0//kubernetes-model-core-6.2.0.jar -kubernetes-model-discovery/6.2.0//kubernetes-model-discovery-6.2.0.jar -kubernetes-model-events/6.2.0//kubernetes-model-events-6.2.0.jar -kubernetes-model-extensions/6.2.0//kubernetes-model-extensions-6.2.0.jar -kubernetes-model-flowcontrol/6.2.0//kubernetes-model-flowcontrol-6.2.0.jar -kubernetes-model-gatewayapi/6.2.0//kubernetes-model-gatewayapi-6.2.0.jar -kubernetes-model-metrics/6.2.0//kubernetes-model-metrics-6.2.0.jar -kubernetes-model-networking/6.2.0//kubernetes-model-networking-6.2.0.jar -kubernetes-model-node/6.2.0//kubernetes-model-node-6.2.0.jar -kubernetes-model-policy/6.2.0//kubernetes-model-policy-6.2.0.jar -kubernetes-model-rbac/6.2.0//kubernetes-model-rbac-6.2.0.jar -kubernetes-model-scheduling/6.2.0//kubernetes-model-scheduling-6.2.0.jar -kubernetes-model-storageclass/6.2.0//kubernetes-model-storageclass-6.2.0.jar +kubernetes-client-api/6.3.1//kubernetes-client-api-6.3.1.jar +kubernetes-client/6.3.1//kubernetes-client-6.3.1.jar +kubernetes-httpclient-okhttp/6.3.1//kubernetes-httpclient-okhttp-6.3.1.jar +kubernetes-model-admissionregistration/6.3.1//kubernetes-model-admissionregistration-6.3.1.jar +kubernetes-model-apiextensions/6.3.1//kubernetes-model-apiextensions-6.3.1.jar +kubernetes-model-apps/6.3.1//kubernetes-model-apps-6.3.1.jar +kubernetes-model-autoscaling/6.3.1//kubernetes-model-autoscaling-6.3.1.jar +kubernetes-model-batch/6.3.1//kubernetes-model-batch-6.3.1.jar +kubernetes-model-certificates/6.3.1//kubernetes-model-certificates-6.3.1.jar +kubernetes-model-common/6.3.1//kubernetes-model-common-6.3.1.jar +kubernetes-model-coordination/6.3.1//kubernetes-model-coordination-6.3.1.jar +kubernetes-model-core/6.3.1//kubernetes-model-core-6.3.1.jar +kubernetes-model-discovery/6.3.1//kubernetes-model-discovery-6.3.1.jar +kubernetes-model-events/6.3.1//kubernetes-model-events-6.3.1.jar +kubernetes-model-extensions/6.3.1//kubernetes-model-extensions-6.3.1.jar +kubernetes-model-flowcontrol/6.3.1//kubernetes-model-flowcontrol-6.3.1.jar +kubernetes-model-gatewayapi/6.3.1//kubernetes-model-gatewayapi-6.3.1.jar +kubernetes-model-metrics/6.3.1//kubernetes-model-metrics-6.3.1.jar +kubernetes-model-networking/6.3.1//kubernetes-model-networking-6.3.1.jar +kubernetes-model-node/6.3.1//kubernetes-model-node-6.3.1.jar +kubernetes-model-policy/6.3.1//kubernetes-model-policy-6.3.1.jar +kubernetes-model-rbac/6.3.1//kubernetes-model-rbac-6.3.1.jar +kubernetes-model-scheduling/6.3.1//kubernetes-model-scheduling-6.3.1.jar +kubernetes-model-storageclass/6.3.1//kubernetes-model-storageclass-6.3.1.jar lapack/3.0.2//lapack-3.0.2.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 162816bdc399..1d37871f0af4 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -143,30 +143,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar jul-to-slf4j/2.0.5//jul-to-slf4j-2.0.5.jar kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar -kubernetes-client-api/6.2.0//kubernetes-client-api-6.2.0.jar -kubernetes-client/6.2.0//kubernetes-client-6.2.0.jar -kubernetes-httpclient-okhttp/6.2.0//kubernetes-httpclient-okhttp-6.2.0.jar -kubernetes-model-admissionregistration/6.2.0//kubernetes-model-admissionregistration-6.2.0.jar -kubernetes-model-apiextensions/6.2.0//kubernetes-model-apiextensions-6.2.0.jar -kubernetes-model-apps/6.2.0//kubernetes-model-apps-6.2.0.jar -kubernetes-model-autoscaling/6.2.0//kubernetes-model-autoscaling-6.2.0.jar -kubernetes-model-batch/6.2.0//kubernetes-model-batch-6.2.0.jar -kubernetes-model-certificates/6.2.0//kubernetes-model-certificates-6.2.0.jar -kubernetes-model-common/6.2.0//kubernetes-model-common-6.2.0.jar -kubernetes-model-coordination/6.2.0//kubernetes-model-coordination-6.2.0.jar -kubernetes-model-core/6.2.0//kubernetes-model-core-6.2.0.jar -kubernetes-model-discovery/6.2.0//kubernetes-model-discovery-6.2.0.jar -kubernetes-model-events/6.2.0//kubernetes-model-events-6.2.0.jar -kubernetes-model-extensions/6.2.0//kubernetes-model-extensions-6.2.0.jar -kubernetes-model-flowcontrol/6.2.0//kubernetes-model-flowcontrol-6.2.0.jar -kubernetes-model-gatewayapi/6.2.0//kubernetes-model-gatewayapi-6.2.0.jar -kubernetes-model-metrics/6.2.0//kubernetes-model-metrics-6.2.0.jar -kubernetes-model-networking/6.2.0//kubernetes-model-networking-6.2.0.jar -kubernetes-model-node/6.2.0//kubernetes-model-node-6.2.0.jar -kubernetes-model-policy/6.2.0//kubernetes-model-policy-6.2.0.jar -kubernetes-model-rbac/6.2.0//kubernetes-model-rbac-6.2.0.jar -kubernetes-model-scheduling/6.2.0//kubernetes-model-scheduling-6.2.0.jar -kubernetes-model-storageclass/6.2.0//kubernetes-model-storageclass-6.2.0.jar +kubernetes-client-api/6.3.1//kubernetes-client-api-6.3.1.jar +kubernetes-client/6.3.1//kubernetes-client-6.3.1.jar +kubernetes-httpclient-okhttp/6.3.1//kubernetes-httpclient-okhttp-6.3.1.jar +kubernetes-model-admissionregistration/6.3.1//kubernetes-model-admissionregistration-6.3.1.jar +kubernetes-model-apiextensions/6.3.1//kubernetes-model-apiextensions-6.3.1.jar +kubernetes-model-apps/6.3.1//kubernetes-model-apps-6.3.1.jar +kubernetes-model-autoscaling/6.3.1//kubernetes-model-autoscaling-6.3.1.jar +kubernetes-model-batch/6.3.1//kubernetes-model-batch-6.3.1.jar +kubernetes-model-certificates/6.3.1//kubernetes-model-certificates-6.3.1.jar +kubernetes-model-common/6.3.1//kubernetes-model-common-6.3.1.jar +kubernetes-model-coordination/6.3.1//kubernetes-model-coordination-6.3.1.jar +kubernetes-model-core/6.3.1//kubernetes-model-core-6.3.1.jar +kubernetes-model-discovery/6.3.1//kubernetes-model-discovery-6.3.1.jar +kubernetes-model-events/6.3.1//kubernetes-model-events-6.3.1.jar +kubernetes-model-extensions/6.3.1//kubernetes-model-extensions-6.3.1.jar +kubernetes-model-flowcontrol/6.3.1//kubernetes-model-flowcontrol-6.3.1.jar +kubernetes-model-gatewayapi/6.3.1//kubernetes-model-gatewayapi-6.3.1.jar +kubernetes-model-metrics/6.3.1//kubernetes-model-metrics-6.3.1.jar +kubernetes-model-networking/6.3.1//kubernetes-model-networking-6.3.1.jar +kubernetes-model-node/6.3.1//kubernetes-model-node-6.3.1.jar +kubernetes-model-policy/6.3.1//kubernetes-model-policy-6.3.1.jar +kubernetes-model-rbac/6.3.1//kubernetes-model-rbac-6.3.1.jar +kubernetes-model-scheduling/6.3.1//kubernetes-model-scheduling-6.3.1.jar +kubernetes-model-storageclass/6.3.1//kubernetes-model-storageclass-6.3.1.jar lapack/3.0.2//lapack-3.0.2.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 e5d8d2d06bac..c9bd539c7151 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ 10.0.1 org.fusesource.leveldbjni - 6.2.0 + 6.3.1 ${java.home}