Skip to content

[SPARK-33012][BUILD][K8S] Upgrade fabric8 to 4.10.3 #29888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laflechejonathan wants to merge 2 commits into from
Closed

[SPARK-33012][BUILD][K8S] Upgrade fabric8 to 4.10.3 #29888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee845e0
Upgrade fabric8 to 4.10.3
Sep 28, 2020
9aa0bdb
remove okhttp pin, regenerate manifests
Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions dev/deps/spark-deps-hadoop-2.7-hive-1.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
kubernetes-client/4.10.3//kubernetes-client-4.10.3.jar
kubernetes-model-admissionregistration/4.10.3//kubernetes-model-admissionregistration-4.10.3.jar
kubernetes-model-apiextensions/4.10.3//kubernetes-model-apiextensions-4.10.3.jar
kubernetes-model-apps/4.10.3//kubernetes-model-apps-4.10.3.jar
kubernetes-model-autoscaling/4.10.3//kubernetes-model-autoscaling-4.10.3.jar
kubernetes-model-batch/4.10.3//kubernetes-model-batch-4.10.3.jar
kubernetes-model-certificates/4.10.3//kubernetes-model-certificates-4.10.3.jar
kubernetes-model-common/4.10.3//kubernetes-model-common-4.10.3.jar
kubernetes-model-coordination/4.10.3//kubernetes-model-coordination-4.10.3.jar
kubernetes-model-core/4.10.3//kubernetes-model-core-4.10.3.jar
kubernetes-model-discovery/4.10.3//kubernetes-model-discovery-4.10.3.jar
kubernetes-model-events/4.10.3//kubernetes-model-events-4.10.3.jar
kubernetes-model-extensions/4.10.3//kubernetes-model-extensions-4.10.3.jar
kubernetes-model-metrics/4.10.3//kubernetes-model-metrics-4.10.3.jar
kubernetes-model-networking/4.10.3//kubernetes-model-networking-4.10.3.jar
kubernetes-model-policy/4.10.3//kubernetes-model-policy-4.10.3.jar
kubernetes-model-rbac/4.10.3//kubernetes-model-rbac-4.10.3.jar
kubernetes-model-scheduling/4.10.3//kubernetes-model-scheduling-4.10.3.jar
kubernetes-model-settings/4.10.3//kubernetes-model-settings-4.10.3.jar
kubernetes-model-storageclass/4.10.3//kubernetes-model-storageclass-4.10.3.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
logging-interceptor/3.12.6//logging-interceptor-3.12.6.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
machinist_2.12/0.6.8//machinist_2.12-0.6.8.jar
macro-compat_2.12/1.1.1//macro-compat_2.12-1.1.1.jar
Expand All @@ -159,9 +176,10 @@ metrics-jvm/4.1.1//metrics-jvm-4.1.1.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.51.Final//netty-all-4.1.51.Final.jar
objenesis/2.6//objenesis-2.6.jar
okhttp/3.12.6//okhttp-3.12.6.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.14.0//okio-1.14.0.jar
opencsv/2.3//opencsv-2.3.jar
openshift-model/4.10.3//openshift-model-4.10.3.jar
orc-core/1.5.10/nohive/orc-core-1.5.10-nohive.jar
orc-mapreduce/1.5.10/nohive/orc-mapreduce-1.5.10-nohive.jar
orc-shims/1.5.10//orc-shims-1.5.10.jar
Expand Down
28 changes: 23 additions & 5 deletions dev/deps/spark-deps-hadoop-2.7-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
kubernetes-client/4.10.3//kubernetes-client-4.10.3.jar
kubernetes-model-admissionregistration/4.10.3//kubernetes-model-admissionregistration-4.10.3.jar
kubernetes-model-apiextensions/4.10.3//kubernetes-model-apiextensions-4.10.3.jar
kubernetes-model-apps/4.10.3//kubernetes-model-apps-4.10.3.jar
kubernetes-model-autoscaling/4.10.3//kubernetes-model-autoscaling-4.10.3.jar
kubernetes-model-batch/4.10.3//kubernetes-model-batch-4.10.3.jar
kubernetes-model-certificates/4.10.3//kubernetes-model-certificates-4.10.3.jar
kubernetes-model-common/4.10.3//kubernetes-model-common-4.10.3.jar
kubernetes-model-coordination/4.10.3//kubernetes-model-coordination-4.10.3.jar
kubernetes-model-core/4.10.3//kubernetes-model-core-4.10.3.jar
kubernetes-model-discovery/4.10.3//kubernetes-model-discovery-4.10.3.jar
kubernetes-model-events/4.10.3//kubernetes-model-events-4.10.3.jar
kubernetes-model-extensions/4.10.3//kubernetes-model-extensions-4.10.3.jar
kubernetes-model-metrics/4.10.3//kubernetes-model-metrics-4.10.3.jar
kubernetes-model-networking/4.10.3//kubernetes-model-networking-4.10.3.jar
kubernetes-model-policy/4.10.3//kubernetes-model-policy-4.10.3.jar
kubernetes-model-rbac/4.10.3//kubernetes-model-rbac-4.10.3.jar
kubernetes-model-scheduling/4.10.3//kubernetes-model-scheduling-4.10.3.jar
kubernetes-model-settings/4.10.3//kubernetes-model-settings-4.10.3.jar
kubernetes-model-storageclass/4.10.3//kubernetes-model-storageclass-4.10.3.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
logging-interceptor/3.12.6//logging-interceptor-3.12.6.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
machinist_2.12/0.6.8//machinist_2.12-0.6.8.jar
macro-compat_2.12/1.1.1//macro-compat_2.12-1.1.1.jar
Expand All @@ -174,9 +191,10 @@ metrics-jvm/4.1.1//metrics-jvm-4.1.1.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.51.Final//netty-all-4.1.51.Final.jar
objenesis/2.6//objenesis-2.6.jar
okhttp/3.12.6//okhttp-3.12.6.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.14.0//okio-1.14.0.jar
opencsv/2.3//opencsv-2.3.jar
openshift-model/4.10.3//openshift-model-4.10.3.jar
orc-core/1.5.10//orc-core-1.5.10.jar
orc-mapreduce/1.5.10//orc-mapreduce-1.5.10.jar
orc-shims/1.5.10//orc-shims-1.5.10.jar
Expand Down
28 changes: 23 additions & 5 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,31 @@ kerby-pkix/1.0.1//kerby-pkix-1.0.1.jar
kerby-util/1.0.1//kerby-util-1.0.1.jar
kerby-xdr/1.0.1//kerby-xdr-1.0.1.jar
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
kubernetes-client/4.9.2//kubernetes-client-4.9.2.jar
kubernetes-model-common/4.9.2//kubernetes-model-common-4.9.2.jar
kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
kubernetes-client/4.10.3//kubernetes-client-4.10.3.jar
kubernetes-model-admissionregistration/4.10.3//kubernetes-model-admissionregistration-4.10.3.jar
kubernetes-model-apiextensions/4.10.3//kubernetes-model-apiextensions-4.10.3.jar
kubernetes-model-apps/4.10.3//kubernetes-model-apps-4.10.3.jar
kubernetes-model-autoscaling/4.10.3//kubernetes-model-autoscaling-4.10.3.jar
Copy link
Member

@srowen srowen Sep 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are all of these additional deps needed - if they really aren't we might exclude them for tidiness.

Copy link
Author

@laflechejonathan laflechejonathan Sep 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we have a choice here, it looks like kubernetes-client split their jar into smaller dependencies:
fabric8io/kubernetes-client#2108, and since we depend on the top level kubernetes-client, we must pull these in.

kubernetes-model-batch/4.10.3//kubernetes-model-batch-4.10.3.jar
kubernetes-model-certificates/4.10.3//kubernetes-model-certificates-4.10.3.jar
kubernetes-model-common/4.10.3//kubernetes-model-common-4.10.3.jar
kubernetes-model-coordination/4.10.3//kubernetes-model-coordination-4.10.3.jar
kubernetes-model-core/4.10.3//kubernetes-model-core-4.10.3.jar
kubernetes-model-discovery/4.10.3//kubernetes-model-discovery-4.10.3.jar
kubernetes-model-events/4.10.3//kubernetes-model-events-4.10.3.jar
kubernetes-model-extensions/4.10.3//kubernetes-model-extensions-4.10.3.jar
kubernetes-model-metrics/4.10.3//kubernetes-model-metrics-4.10.3.jar
kubernetes-model-networking/4.10.3//kubernetes-model-networking-4.10.3.jar
kubernetes-model-policy/4.10.3//kubernetes-model-policy-4.10.3.jar
kubernetes-model-rbac/4.10.3//kubernetes-model-rbac-4.10.3.jar
kubernetes-model-scheduling/4.10.3//kubernetes-model-scheduling-4.10.3.jar
kubernetes-model-settings/4.10.3//kubernetes-model-settings-4.10.3.jar
kubernetes-model-storageclass/4.10.3//kubernetes-model-storageclass-4.10.3.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
logging-interceptor/3.12.6//logging-interceptor-3.12.6.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
machinist_2.12/0.6.8//machinist_2.12-0.6.8.jar
macro-compat_2.12/1.1.1//macro-compat_2.12-1.1.1.jar
Expand All @@ -188,9 +205,10 @@ netty-all/4.1.51.Final//netty-all-4.1.51.Final.jar
nimbus-jose-jwt/4.41.1//nimbus-jose-jwt-4.41.1.jar
objenesis/2.6//objenesis-2.6.jar
okhttp/2.7.5//okhttp-2.7.5.jar
okhttp/3.12.6//okhttp-3.12.6.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.14.0//okio-1.14.0.jar
opencsv/2.3//opencsv-2.3.jar
openshift-model/4.10.3//openshift-model-4.10.3.jar
orc-core/1.5.10//orc-core-1.5.10.jar
orc-mapreduce/1.5.10//orc-mapreduce-1.5.10.jar
orc-shims/1.5.10//orc-shims-1.5.10.jar
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<properties>
<sbt.project.name>kubernetes</sbt.project.name>
<!-- Note: Please update the kubernetes client version in kubernetes/integration-tests/pom.xml -->
<kubernetes.client.version>4.9.2</kubernetes.client.version>
<kubernetes.client.version>4.10.3</kubernetes.client.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<properties>
<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
<extraScalaTestArgs></extraScalaTestArgs>
<kubernetes-client.version>4.9.2</kubernetes-client.version>
<kubernetes-client.version>4.10.3</kubernetes-client.version>
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>

<!-- Integration Test Configuration Properties -->
Expand Down