You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2020/05/24 01:08:42 UTC
[spark] 02/03: [SPARK-30715][K8S][TESTS][FOLLOWUP] Update k8s
client version in IT as well
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
commit 1e79c0ddb23ff159f6023b9840d0dc0bdee289c3
Author: Prashant Sharma <pr...@in.ibm.com>
AuthorDate: Sat Mar 21 18:26:53 2020 -0700
[SPARK-30715][K8S][TESTS][FOLLOWUP] Update k8s client version in IT as well
### What changes were proposed in this pull request?
This is a follow up for SPARK-30715 . Kubernetes client version in sync in integration-tests and kubernetes/core
### Why are the changes needed?
More than once, the kubernetes client version has gone out of sync between integration tests and kubernetes/core. So brought them up in sync again and added a comment to save us from future need of this additional followup.
### Does this PR introduce any user-facing change?
No
### How was this patch tested?
Manually.
Closes #27948 from ScrapCodes/follow-up-spark-30715.
Authored-by: Prashant Sharma <pr...@in.ibm.com>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit 3799d2b9d842f4b9f4e78bf701f5e123f0061bad)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
resource-managers/kubernetes/core/pom.xml | 1 +
resource-managers/kubernetes/integration-tests/pom.xml | 2 +-
.../apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index 9d35c81..36d9543 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -29,6 +29,7 @@
<name>Spark Project Kubernetes</name>
<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.7.1</kubernetes.client.version>
</properties>
diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index 3222ec7..92ddeae 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -29,7 +29,7 @@
<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
<extraScalaTestArgs></extraScalaTestArgs>
- <kubernetes-client.version>4.6.4</kubernetes-client.version>
+ <kubernetes-client.version>4.7.1</kubernetes-client.version>
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
<scalatest-maven-plugin.version>1.0</scalatest-maven-plugin.version>
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>
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 00996df..dbb84e3 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
@@ -59,15 +59,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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org