diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 18793defee..b527816015 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -29,6 +29,7 @@ Spark Project Kubernetes kubernetes + 4.7.1 diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index a522e87c4a..7a889c427b 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -29,7 +29,7 @@ 1.3.0 1.4.0 - 4.6.4 + 4.7.1 3.2.2 1.0 kubernetes-integration-tests diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala index eaaf67db69..4de7e70c1f 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala @@ -61,15 +61,15 @@ class KubernetesSuite extends SparkFunSuite protected var appLocator: String = _ // Default memory limit is 1024M + 384M (minimum overhead constant) - private val baseMemory = s"${1024 + 384}Mi" + private val baseMemory = s"${1024 + 384}" protected val memOverheadConstant = 0.8 - private val standardNonJVMMemory = s"${(1024 + 0.4*1024).toInt}Mi" + private val standardNonJVMMemory = s"${(1024 + 0.4*1024).toInt}" protected val additionalMemory = 200 // 209715200 is 200Mi protected val additionalMemoryInBytes = 209715200 - private val extraDriverTotalMemory = s"${(1024 + memOverheadConstant*1024).toInt}Mi" + private val extraDriverTotalMemory = s"${(1024 + memOverheadConstant*1024).toInt}" private val extraExecTotalMemory = - s"${(1024 + memOverheadConstant*1024 + additionalMemory).toInt}Mi" + s"${(1024 + memOverheadConstant*1024 + additionalMemory).toInt}" /** * Build the image ref for the given image name, taking the repo and tag from the