diff --git a/pom.xml b/pom.xml index 0d158b4d04b6d..fa6bc317bdc67 100644 --- a/pom.xml +++ b/pom.xml @@ -1117,6 +1117,13 @@ pom import + + io.fabric8 + kubernetes-client-bom + ${kubernetes-client.version} + pom + import + org.apache.ws.xmlschema xmlschema-core diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 1863ac0842458..724b42942c7e5 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1282,7 +1282,9 @@ object DependencyOverrides { lazy val jacksonDeps = Bom.dependencies("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion) lazy val grpcVersion = sys.props.get("io.grpc.version").getOrElse("1.76.0") lazy val grpcDeps = Bom.dependencies("io.grpc" % "grpc-bom" % grpcVersion) - lazy val settings = jacksonDeps ++ grpcDeps ++ Seq( + lazy val k8sClientVersion = sys.props.get("kubernetes-client.version").getOrElse("7.7.0") + lazy val k8sClientDeps = Bom.dependencies("io.fabric8" % "kubernetes-client-bom" % k8sClientVersion) + lazy val settings = jacksonDeps ++ grpcDeps ++ k8sClientDeps ++ Seq( dependencyOverrides ++= { val guavaVersion = sys.props.get("guava.version").getOrElse( SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]) @@ -1304,7 +1306,7 @@ object DependencyOverrides { "org.slf4j" % "slf4j-api" % slf4jVersion, "org.tukaani" % "xz" % xzVersion, "org.scala-lang" % "scalap" % scalaVersion.value - ) ++ jacksonDeps.key.value ++ grpcDeps.key.value + ) ++ jacksonDeps.key.value ++ grpcDeps.key.value ++ k8sClientDeps.key.value } ) } diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 26eba17295231..b640b60c4eab9 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -41,12 +41,10 @@ io.fabric8 volcano-model - ${kubernetes-client.version} io.fabric8 volcano-client - ${kubernetes-client.version} @@ -111,7 +109,6 @@ io.fabric8 kubernetes-client - ${kubernetes-client.version} com.fasterxml.jackson.core diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index fa516ca9064c9..68abadb9c883a 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -66,7 +66,6 @@ io.fabric8 kubernetes-client - ${kubernetes-client.version} io.vertx @@ -232,7 +231,6 @@ io.fabric8 volcano-client - ${kubernetes-client.version}