diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index 8c1ab9e3c1cfe..5a7948491173f 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -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 @@ -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 diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index fcb993033221e..3cc402db9b843 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -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 @@ -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 diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 9ae48f4da8b05..edeb95fdba684 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -30,7 +30,7 @@ kubernetes - 4.11.1 + 4.12.0 diff --git a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/Fabric8Aliases.scala b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/Fabric8Aliases.scala index 23055813a9786..5b36bd144d0f9 100644 --- a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/Fabric8Aliases.scala +++ b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/Fabric8Aliases.scala @@ -17,7 +17,7 @@ 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 { @@ -25,9 +25,9 @@ object Fabric8Aliases { 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] diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 5274c0579eb05..258d3dfc3df9d 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -28,7 +28,7 @@ 1.3.0 - 4.11.1 + 4.12.0 kubernetes-integration-tests