remove client mode specific overrides, simplify config names

Author: onursatici

docs/running-on-kubernetes.md

@@ -991,49 +991,31 @@ See the [configuration page](configuration.html) for information on Spark config
   </td>
 </tr>
 <tr>
-  <td><code>spark.kubernetes.kubernetesClient.submission.connectionTimeout</code></td>
+  <td><code>spark.kubernetes.submission.connectionTimeout</code></td>
   <td>10000</td>
   <td>
-    Connection timeout in milliseconds for the kubernetes client to use for starting the driver. In client mode, use
-    <code>spark.kubernetes.kubernetesClient.connectionTimeout</code> instead.
+    Connection timeout in milliseconds for the kubernetes client to use for starting the driver.
   </td>
 </tr>
 <tr>
-  <td><code>spark.kubernetes.kubernetesClient.submission.requestTimeout</code></td>
+  <td><code>spark.kubernetes.submission.requestTimeout</code></td>
   <td>10000</td>
   <td>
-    Request timeout in milliseconds for the kubernetes client to use for starting the driver. In client mode, use
-    <code>spark.kubernetes.kubernetesClient.submission.requestTimeout</code> instead.
+    Request timeout in milliseconds for the kubernetes client to use for starting the driver.
   </td>
 </tr>
 <tr>
-  <td><code>spark.kubernetes.kubernetesClient.driver.connectionTimeout</code></td>
+  <td><code>spark.kubernetes.driver.connectionTimeout</code></td>
   <td>10000</td>
   <td>
     Connection timeout in milliseconds for the kubernetes client in driver to use when requesting executors.
-    In client mode, use <code>spark.kubernetes.kubernetesClient.connectionTimeout</code> instead.
   </td>
 </tr>
 <tr>
-  <td><code>spark.kubernetes.kubernetesClient.driver.requestTimeout</code></td>
+  <td><code>spark.kubernetes.driver.requestTimeout</code></td>
   <td>10000</td>
   <td>
     Request timeout in milliseconds for the kubernetes client in driver to use when requesting executors.
-    In client mode, use <code>spark.kubernetes.kubernetesClient.connectionTimeout</code> instead.
-  </td>
-</tr>
-<tr>
-  <td><code>spark.kubernetes.kubernetesClient.connectionTimeout</code></td>
-  <td>10000</td>
-  <td>
-    In client mode, connection timeout in milliseconds for the kubernetes client in driver to use when requesting executors.
-  </td>
-</tr>
-<tr>
-  <td><code>spark.kubernetes.kubernetesClient.requestTimeout</code></td>
-  <td>10000</td>
-  <td>
-    In client mode, request timeout in milliseconds for the kubernetes client in driver to use when requesting executors.
   </td>
 </tr>
 </table>

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala

@@ -87,41 +87,29 @@ private[spark] object Config extends Logging {
   val CA_CERT_FILE_CONF_SUFFIX = "caCertFile"
 
   val SUBMISSION_CLIENT_REQUEST_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.submission.requestTimeout")
+    ConfigBuilder("spark.kubernetes.submission.requestTimeout")
       .doc("request timeout to be used in milliseconds for starting the driver")
       .intConf
       .createWithDefault(10000)
 
   val SUBMISSION_CLIENT_CONNECTION_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.submission.connectionTimeout")
+    ConfigBuilder("spark.kubernetes.submission.connectionTimeout")
       .doc("connection timeout to be used in milliseconds for starting the driver")
       .intConf
       .createWithDefault(10000)
 
   val DRIVER_CLIENT_REQUEST_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.driver.requestTimeout")
+    ConfigBuilder("spark.kubernetes.driver.requestTimeout")
       .doc("request timeout to be used in milliseconds for requesting executors")
       .intConf
       .createWithDefault(10000)
 
   val DRIVER_CLIENT_CONNECTION_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.driver.connectionTimeout")
+    ConfigBuilder("spark.kubernetes.driver.connectionTimeout")
       .doc("connection timeout to be used in milliseconds for requesting executors")
       .intConf
       .createWithDefault(10000)
 
-  val CLIENT_MODE_CLIENT_REQUEST_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.requestTimeout")
-      .doc("request timeout to be used in milliseconds for requesting executors in client mode")
-      .intConf
-      .createWithDefault(10000)
-
-  val CLIENT_MODE_CLIENT_CONNECTION_TIMEOUT =
-    ConfigBuilder("spark.kubernetes.kubernetesClient.connectionTimeout")
-      .doc("connection timeout to be used in milliseconds for requesting executors in client mode")
-      .intConf
-      .createWithDefault(10000)
-
   val KUBERNETES_SERVICE_ACCOUNT_NAME =
     ConfigBuilder(s"$KUBERNETES_AUTH_DRIVER_CONF_PREFIX.serviceAccountName")
       .doc("Service account that is used when running the driver pod. The driver pod uses " +

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/SparkKubernetesClientFactory.scala

@@ -124,7 +124,6 @@ private[spark] object SparkKubernetesClientFactory extends Logging {
     import Config._
     val Driver = Val(DRIVER_CLIENT_REQUEST_TIMEOUT, DRIVER_CLIENT_CONNECTION_TIMEOUT)
     val Submission = Val(SUBMISSION_CLIENT_REQUEST_TIMEOUT, SUBMISSION_CLIENT_CONNECTION_TIMEOUT)
-    val ClientMode = Val(CLIENT_MODE_CLIENT_REQUEST_TIMEOUT, CLIENT_MODE_CLIENT_CONNECTION_TIMEOUT)
 
     protected case class Val(
         requestTimeoutEntry: ConfigEntry[Int],

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/KubernetesClusterManager.scala

@@ -58,7 +58,7 @@ private[spark] class KubernetesClusterManager extends ExternalClusterManager wit
         Some(new File(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH)))
     } else {
       (KUBERNETES_AUTH_CLIENT_MODE_PREFIX,
-        SparkKubernetesClientFactory.ClientType.ClientMode,
+        SparkKubernetesClientFactory.ClientType.Driver,
         KubernetesUtils.parseMasterUrl(masterURL),
         None,
         None)