Skip to content

Commit

Permalink
[SPARK-33471][K8S][BUILD] Upgrade kubernetes-client to 4.12.0
Browse files Browse the repository at this point in the history 
### What changes were proposed in this pull request?

This PR aims to upgrade Kubernetes-client from 4.11.1 to 4.12.0

### Why are the changes needed?

This upgrades the dependency for Apache Spark 3.1.0.

### Does this PR introduce any user-facing change?

No.

### How was this patch tested?

Pass the CIs.

Closes #30401 from ramesh-muthusamy/SPARK-33471-k8s-clientupgrade.

Authored-by: Rameshkrishnan Muthusamy <rameshkrishnan_muthusamy@apple.com>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
  • Loading branch information
@ramesh-muthusamy @dongjoon-hyun
ramesh-muthusamy authored and dongjoon-hyun committed Nov 17, 2020
1 parent 2a8e253 commit 5e85499
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 47 deletions.
41 changes: 20 additions & 21 deletions dev/deps/spark-deps-hadoop-2.7-hive-2.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,26 +155,26 @@ 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.11.1//kubernetes-client-4.11.1.jar
kubernetes-model-admissionregistration/4.11.1//kubernetes-model-admissionregistration-4.11.1.jar
kubernetes-model-apiextensions/4.11.1//kubernetes-model-apiextensions-4.11.1.jar
kubernetes-model-apps/4.11.1//kubernetes-model-apps-4.11.1.jar
kubernetes-model-autoscaling/4.11.1//kubernetes-model-autoscaling-4.11.1.jar
kubernetes-model-batch/4.11.1//kubernetes-model-batch-4.11.1.jar
kubernetes-model-certificates/4.11.1//kubernetes-model-certificates-4.11.1.jar
kubernetes-model-common/4.11.1//kubernetes-model-common-4.11.1.jar
kubernetes-model-coordination/4.11.1//kubernetes-model-coordination-4.11.1.jar
kubernetes-model-core/4.11.1//kubernetes-model-core-4.11.1.jar
kubernetes-model-discovery/4.11.1//kubernetes-model-discovery-4.11.1.jar
kubernetes-model-events/4.11.1//kubernetes-model-events-4.11.1.jar
kubernetes-model-extensions/4.11.1//kubernetes-model-extensions-4.11.1.jar
kubernetes-model-metrics/4.11.1//kubernetes-model-metrics-4.11.1.jar
kubernetes-model-networking/4.11.1//kubernetes-model-networking-4.11.1.jar
kubernetes-model-policy/4.11.1//kubernetes-model-policy-4.11.1.jar
kubernetes-model-rbac/4.11.1//kubernetes-model-rbac-4.11.1.jar
kubernetes-model-scheduling/4.11.1//kubernetes-model-scheduling-4.11.1.jar
kubernetes-model-settings/4.11.1//kubernetes-model-settings-4.11.1.jar
kubernetes-model-storageclass/4.11.1//kubernetes-model-storageclass-4.11.1.jar
kubernetes-client/4.12.0//kubernetes-client-4.12.0.jar
kubernetes-model-admissionregistration/4.12.0//kubernetes-model-admissionregistration-4.12.0.jar
kubernetes-model-apiextensions/4.12.0//kubernetes-model-apiextensions-4.12.0.jar
kubernetes-model-apps/4.12.0//kubernetes-model-apps-4.12.0.jar
kubernetes-model-autoscaling/4.12.0//kubernetes-model-autoscaling-4.12.0.jar
kubernetes-model-batch/4.12.0//kubernetes-model-batch-4.12.0.jar
kubernetes-model-certificates/4.12.0//kubernetes-model-certificates-4.12.0.jar
kubernetes-model-common/4.12.0//kubernetes-model-common-4.12.0.jar
kubernetes-model-coordination/4.12.0//kubernetes-model-coordination-4.12.0.jar
kubernetes-model-core/4.12.0//kubernetes-model-core-4.12.0.jar
kubernetes-model-discovery/4.12.0//kubernetes-model-discovery-4.12.0.jar
kubernetes-model-events/4.12.0//kubernetes-model-events-4.12.0.jar
kubernetes-model-extensions/4.12.0//kubernetes-model-extensions-4.12.0.jar
kubernetes-model-metrics/4.12.0//kubernetes-model-metrics-4.12.0.jar
kubernetes-model-networking/4.12.0//kubernetes-model-networking-4.12.0.jar
kubernetes-model-policy/4.12.0//kubernetes-model-policy-4.12.0.jar
kubernetes-model-rbac/4.12.0//kubernetes-model-rbac-4.12.0.jar
kubernetes-model-scheduling/4.12.0//kubernetes-model-scheduling-4.12.0.jar
kubernetes-model-settings/4.12.0//kubernetes-model-settings-4.12.0.jar
kubernetes-model-storageclass/4.12.0//kubernetes-model-storageclass-4.12.0.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
Expand All @@ -195,7 +195,6 @@ objenesis/2.6//objenesis-2.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.11.1//openshift-model-4.11.1.jar
orc-core/1.5.12//orc-core-1.5.12.jar
orc-mapreduce/1.5.12//orc-mapreduce-1.5.12.jar
orc-shims/1.5.12//orc-shims-1.5.12.jar
Expand Down
41 changes: 20 additions & 21 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,26 @@ 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.11.1//kubernetes-client-4.11.1.jar
kubernetes-model-admissionregistration/4.11.1//kubernetes-model-admissionregistration-4.11.1.jar
kubernetes-model-apiextensions/4.11.1//kubernetes-model-apiextensions-4.11.1.jar
kubernetes-model-apps/4.11.1//kubernetes-model-apps-4.11.1.jar
kubernetes-model-autoscaling/4.11.1//kubernetes-model-autoscaling-4.11.1.jar
kubernetes-model-batch/4.11.1//kubernetes-model-batch-4.11.1.jar
kubernetes-model-certificates/4.11.1//kubernetes-model-certificates-4.11.1.jar
kubernetes-model-common/4.11.1//kubernetes-model-common-4.11.1.jar
kubernetes-model-coordination/4.11.1//kubernetes-model-coordination-4.11.1.jar
kubernetes-model-core/4.11.1//kubernetes-model-core-4.11.1.jar
kubernetes-model-discovery/4.11.1//kubernetes-model-discovery-4.11.1.jar
kubernetes-model-events/4.11.1//kubernetes-model-events-4.11.1.jar
kubernetes-model-extensions/4.11.1//kubernetes-model-extensions-4.11.1.jar
kubernetes-model-metrics/4.11.1//kubernetes-model-metrics-4.11.1.jar
kubernetes-model-networking/4.11.1//kubernetes-model-networking-4.11.1.jar
kubernetes-model-policy/4.11.1//kubernetes-model-policy-4.11.1.jar
kubernetes-model-rbac/4.11.1//kubernetes-model-rbac-4.11.1.jar
kubernetes-model-scheduling/4.11.1//kubernetes-model-scheduling-4.11.1.jar
kubernetes-model-settings/4.11.1//kubernetes-model-settings-4.11.1.jar
kubernetes-model-storageclass/4.11.1//kubernetes-model-storageclass-4.11.1.jar
kubernetes-client/4.12.0//kubernetes-client-4.12.0.jar
kubernetes-model-admissionregistration/4.12.0//kubernetes-model-admissionregistration-4.12.0.jar
kubernetes-model-apiextensions/4.12.0//kubernetes-model-apiextensions-4.12.0.jar
kubernetes-model-apps/4.12.0//kubernetes-model-apps-4.12.0.jar
kubernetes-model-autoscaling/4.12.0//kubernetes-model-autoscaling-4.12.0.jar
kubernetes-model-batch/4.12.0//kubernetes-model-batch-4.12.0.jar
kubernetes-model-certificates/4.12.0//kubernetes-model-certificates-4.12.0.jar
kubernetes-model-common/4.12.0//kubernetes-model-common-4.12.0.jar
kubernetes-model-coordination/4.12.0//kubernetes-model-coordination-4.12.0.jar
kubernetes-model-core/4.12.0//kubernetes-model-core-4.12.0.jar
kubernetes-model-discovery/4.12.0//kubernetes-model-discovery-4.12.0.jar
kubernetes-model-events/4.12.0//kubernetes-model-events-4.12.0.jar
kubernetes-model-extensions/4.12.0//kubernetes-model-extensions-4.12.0.jar
kubernetes-model-metrics/4.12.0//kubernetes-model-metrics-4.12.0.jar
kubernetes-model-networking/4.12.0//kubernetes-model-networking-4.12.0.jar
kubernetes-model-policy/4.12.0//kubernetes-model-policy-4.12.0.jar
kubernetes-model-rbac/4.12.0//kubernetes-model-rbac-4.12.0.jar
kubernetes-model-scheduling/4.12.0//kubernetes-model-scheduling-4.12.0.jar
kubernetes-model-settings/4.12.0//kubernetes-model-settings-4.12.0.jar
kubernetes-model-storageclass/4.12.0//kubernetes-model-storageclass-4.12.0.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
Expand All @@ -165,7 +165,6 @@ objenesis/2.6//objenesis-2.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.11.1//openshift-model-4.11.1.jar
orc-core/1.5.12//orc-core-1.5.12.jar
orc-mapreduce/1.5.12//orc-mapreduce-1.5.12.jar
orc-shims/1.5.12//orc-shims-1.5.12.jar
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/core/pom.xml
View file
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.11.1</kubernetes.client.version>
<kubernetes.client.version>4.12.0</kubernetes.client.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions ...-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/Fabric8Aliases.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
package org.apache.spark.deploy.k8s

import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapList, DoneableConfigMap, DoneablePod, HasMetadata, Pod, PodList}
import io.fabric8.kubernetes.client.{Watch, Watcher}
import io.fabric8.kubernetes.client.Watch
import io.fabric8.kubernetes.client.dsl.{FilterWatchListDeletable, MixedOperation, NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable, PodResource, Resource}

object Fabric8Aliases {
type PODS = MixedOperation[Pod, PodList, DoneablePod, PodResource[Pod, DoneablePod]]
type CONFIG_MAPS = MixedOperation[
ConfigMap, ConfigMapList, DoneableConfigMap, Resource[ConfigMap, DoneableConfigMap]]
type LABELED_PODS = FilterWatchListDeletable[
Pod, PodList, java.lang.Boolean, Watch, Watcher[Pod]]
Pod, PodList, java.lang.Boolean, Watch]
type LABELED_CONFIG_MAPS = FilterWatchListDeletable[
ConfigMap, ConfigMapList, java.lang.Boolean, Watch, Watcher[ConfigMap]]
ConfigMap, ConfigMapList, java.lang.Boolean, Watch]
type SINGLE_POD = PodResource[Pod, DoneablePod]
type RESOURCE_LIST = NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable[
HasMetadata, Boolean]
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/integration-tests/pom.xml
View file
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.11.1</kubernetes-client.version>
<kubernetes-client.version>4.12.0</kubernetes-client.version>
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>

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

0 comments on commit 5e85499

Please sign in to comment.