From 5a1024b4957db98008b45ae643fe3b98a1852a16 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 2 Sep 2019 16:50:58 -0700 Subject: [PATCH] [SPARK-28921][BUILD][K8S] Upgrade kubernetes client to 4.4.2 Upgrade kubernetes client from 4.1.2 to 4.4.2 To fix compatibility issue with EKS since Amazon rolled out some security patches over the past week; 1.15.3, 1.14.6, 1.13.10, 1.12.10, and 1.11.10. No Pass the Jenkins and manually test on EKS. Closes #25640 from andygrove/SPARK-28921. Authored-by: Andy Grove Signed-off-by: Dongjoon Hyun --- LICENSE-binary | 1 + dev/deps/spark-deps-hadoop-2.7 | 21 ++++++++++-------- dev/deps/spark-deps-hadoop-3.1 | 27 +++++++++++++---------- resource-managers/kubernetes/core/pom.xml | 2 +- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 1346f0622e27b..2b50f286c20f8 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -467,6 +467,7 @@ Common Development and Distribution License (CDDL) 1.1 ------------------------------------------------------ javax.annotation:javax.annotation-api https://jcp.org/en/jsr/detail?id=250 +javax.el:javax.el-api https://javaee.github.io/uel-ri/ javax.servlet:javax.servlet-api https://javaee.github.io/servlet-spec/ javax.transaction:jta http://www.oracle.com/technetwork/java/index.html javax.ws.rs:javax.ws.rs-api https://github.com/jax-rs diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 95b778f711760..db87830020c5a 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -56,9 +56,8 @@ datanucleus-api-jdo-3.2.6.jar datanucleus-core-3.2.10.jar datanucleus-rdbms-3.2.9.jar derby-10.12.1.1.jar -eigenbase-properties-1.1.5.jar -flatbuffers-1.2.0-3f79e055.jar -generex-1.0.1.jar +flatbuffers-java-1.9.0.jar +generex-1.0.2.jar gson-2.2.4.jar guava-14.0.1.jar guice-3.0.jar @@ -97,9 +96,13 @@ jackson-module-jaxb-annotations-2.6.7.jar jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar -janino-3.0.9.jar -javassist-3.18.1-GA.jar -javax.annotation-api-1.2.jar +jakarta.annotation-api-1.3.4.jar +jakarta.inject-2.5.0.jar +jakarta.ws.rs-api-2.1.5.jar +jakarta.xml.bind-api-2.3.2.jar +janino-3.0.15.jar +javassist-3.22.0-CR2.jar +javax.el-3.0.1-b11.jar javax.inject-1.jar javax.inject-2.4.0-b34.jar javax.servlet-api-3.1.0.jar @@ -131,9 +134,9 @@ jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar kryo-shaded-4.0.2.jar -kubernetes-client-4.1.2.jar -kubernetes-model-4.1.2.jar -kubernetes-model-common-4.1.2.jar +kubernetes-client-4.4.2.jar +kubernetes-model-4.4.2.jar +kubernetes-model-common-4.4.2.jar leveldbjni-all-1.8.jar libfb303-0.9.3.jar libthrift-0.9.3.jar diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index 9b2cb8d93499c..0749087fda819 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -56,9 +56,8 @@ datanucleus-rdbms-3.2.9.jar derby-10.12.1.1.jar dnsjava-2.1.7.jar ehcache-3.3.1.jar -eigenbase-properties-1.1.5.jar -flatbuffers-1.2.0-3f79e055.jar -generex-1.0.1.jar +flatbuffers-java-1.9.0.jar +generex-1.0.2.jar geronimo-jcache_1.0_spec-1.0-alpha-1.jar gson-2.2.4.jar guava-14.0.1.jar @@ -94,12 +93,16 @@ jackson-dataformat-yaml-2.6.7.jar jackson-jaxrs-base-2.7.8.jar jackson-jaxrs-json-provider-2.7.8.jar jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations-2.6.7.jar -jackson-module-paranamer-2.7.9.jar -jackson-module-scala_2.11-2.6.7.1.jar -janino-3.0.9.jar -javassist-3.18.1-GA.jar -javax.annotation-api-1.2.jar +jackson-module-jaxb-annotations-2.9.9.jar +jackson-module-paranamer-2.9.9.jar +jackson-module-scala_2.12-2.9.9.jar +jakarta.annotation-api-1.3.4.jar +jakarta.inject-2.5.0.jar +jakarta.ws.rs-api-2.1.5.jar +jakarta.xml.bind-api-2.3.2.jar +janino-3.0.15.jar +javassist-3.22.0-CR2.jar +javax.el-3.0.1-b11.jar javax.inject-1.jar javax.inject-2.4.0-b34.jar javax.servlet-api-3.1.0.jar @@ -147,9 +150,9 @@ kerby-pkix-1.0.1.jar kerby-util-1.0.1.jar kerby-xdr-1.0.1.jar kryo-shaded-4.0.2.jar -kubernetes-client-4.1.2.jar -kubernetes-model-4.1.2.jar -kubernetes-model-common-4.1.2.jar +kubernetes-client-4.4.2.jar +kubernetes-model-4.4.2.jar +kubernetes-model-common-4.4.2.jar leveldbjni-all-1.8.jar libfb303-0.9.3.jar libthrift-0.9.3.jar diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index db3c7e868d862..1b814c8199bd9 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -29,7 +29,7 @@ Spark Project Kubernetes kubernetes - 4.1.2 + 4.4.2