Rename package to k8s (#497)

* Rename package to k8s * Rename string constants
palantir · Sep 26, 2017 · 8b17246 · 8b17246
1 parent b84056e
commit 8b17246
Show file tree

Hide file tree

Showing 115 changed files with 261 additions and 261 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -710,7 +710,7 @@ object SparkSubmit extends CommandLineUtils with Logging {
     }
 
     if (isKubernetesCluster) {
-      childMainClass = "org.apache.spark.deploy.kubernetes.submit.Client"
+      childMainClass = "org.apache.spark.deploy.k8s.submit.Client"
       if (args.isPython) {
         childArgs ++= Array("--primary-py-file", args.primaryResource)
         childArgs ++= Array("--main-class", "org.apache.spark.deploy.PythonRunner")

diff --git a/...re/src/main/resources/META-INF/services/org.apache.spark.scheduler.ExternalClusterManager b/...re/src/main/resources/META-INF/services/org.apache.spark.scheduler.ExternalClusterManager
@@ -1 +1 @@
-org.apache.spark.scheduler.cluster.kubernetes.KubernetesClusterManager
+org.apache.spark.scheduler.cluster.k8s.KubernetesClusterManager
diff --git a/.../deploy/kubernetes/CompressionUtils.scala → ...e/spark/deploy/k8s/CompressionUtils.scala b/.../deploy/kubernetes/CompressionUtils.scala → ...e/spark/deploy/k8s/CompressionUtils.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import java.io.{File, FileInputStream, FileOutputStream, InputStream, OutputStream}
 import java.util.zip.{GZIPInputStream, GZIPOutputStream}

diff --git a/...eploy/kubernetes/ConfigurationUtils.scala → ...spark/deploy/k8s/ConfigurationUtils.scala b/...eploy/kubernetes/ConfigurationUtils.scala → ...spark/deploy/k8s/ConfigurationUtils.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import org.apache.spark.{SparkConf, SparkException}
 import org.apache.spark.internal.Logging

diff --git a/...erResourceStagingServerSecretPlugin.scala → ...erResourceStagingServerSecretPlugin.scala b/...erResourceStagingServerSecretPlugin.scala → ...erResourceStagingServerSecretPlugin.scala
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder, Secret}
 
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.constants._
 
 private[spark] trait InitContainerResourceStagingServerSecretPlugin {
 

diff --git a/...oy/kubernetes/KubernetesCredentials.scala → ...rk/deploy/k8s/KubernetesCredentials.scala b/...oy/kubernetes/KubernetesCredentials.scala → ...rk/deploy/k8s/KubernetesCredentials.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 case class KubernetesCredentials(
   oauthTokenBase64: Option[String],

diff --git a/...es/KubernetesExternalShuffleService.scala → ...8s/KubernetesExternalShuffleService.scala b/...es/KubernetesExternalShuffleService.scala → ...8s/KubernetesExternalShuffleService.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import java.io.File
 import java.nio.ByteBuffer
@@ -29,8 +29,8 @@ import scala.collection.mutable
 
 import org.apache.spark.{SecurityManager, SparkConf}
 import org.apache.spark.deploy.ExternalShuffleService
-import org.apache.spark.deploy.kubernetes.config._
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.config._
+import org.apache.spark.deploy.k8s.constants._
 import org.apache.spark.internal.Logging
 import org.apache.spark.network.client.{RpcResponseCallback, TransportClient}
 import org.apache.spark.network.shuffle.ExternalShuffleBlockHandler

diff --git a/...eploy/kubernetes/OptionRequirements.scala → ...spark/deploy/k8s/OptionRequirements.scala b/...eploy/kubernetes/OptionRequirements.scala → ...spark/deploy/k8s/OptionRequirements.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 private[spark] object OptionRequirements {
 

diff --git a/...rnetes/PodWithDetachedInitContainer.scala → ...oy/k8s/PodWithDetachedInitContainer.scala b/...rnetes/PodWithDetachedInitContainer.scala → ...oy/k8s/PodWithDetachedInitContainer.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import io.fabric8.kubernetes.api.model.{Container, Pod}
 

diff --git a/...rnetes/SparkKubernetesClientFactory.scala → ...oy/k8s/SparkKubernetesClientFactory.scala b/...rnetes/SparkKubernetesClientFactory.scala → ...oy/k8s/SparkKubernetesClientFactory.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import java.io.File
 
@@ -25,7 +25,7 @@ import io.fabric8.kubernetes.client.utils.HttpClientUtils
 import okhttp3.Dispatcher
 
 import org.apache.spark.SparkConf
-import org.apache.spark.deploy.kubernetes.config._
+import org.apache.spark.deploy.k8s.config._
 import org.apache.spark.util.ThreadUtils
 
 /**

diff --git a/...etes/SparkPodInitContainerBootstrap.scala → .../k8s/SparkPodInitContainerBootstrap.scala b/...etes/SparkPodInitContainerBootstrap.scala → .../k8s/SparkPodInitContainerBootstrap.scala
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import io.fabric8.kubernetes.api.model.{ContainerBuilder, EmptyDirVolumeSource, PodBuilder, VolumeMount, VolumeMountBuilder}
 
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.constants._
 
 /**
  * This is separated out from the init-container steps API because this component can be reused to

diff --git a/...ache/spark/deploy/kubernetes/config.scala → .../org/apache/spark/deploy/k8s/config.scala b/...ache/spark/deploy/kubernetes/config.scala → .../org/apache/spark/deploy/k8s/config.scala
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 import java.util.concurrent.TimeUnit
 
 import org.apache.spark.{SPARK_VERSION => sparkVersion}
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.constants._
 import org.apache.spark.internal.Logging
 import org.apache.spark.internal.config.ConfigBuilder
 import org.apache.spark.network.util.ByteUnit

diff --git a/...e/spark/deploy/kubernetes/constants.scala → ...g/apache/spark/deploy/k8s/constants.scala b/...e/spark/deploy/kubernetes/constants.scala → ...g/apache/spark/deploy/k8s/constants.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes
+package org.apache.spark.deploy.k8s
 
 package object constants {
   // Labels

diff --git a/...ark/deploy/kubernetes/submit/Client.scala → ...ache/spark/deploy/k8s/submit/Client.scala b/...ark/deploy/kubernetes/submit/Client.scala → ...ache/spark/deploy/k8s/submit/Client.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.util.{Collections, UUID}
 
@@ -24,10 +24,10 @@ import scala.collection.JavaConverters._
 import scala.collection.mutable
 
 import org.apache.spark.SparkConf
-import org.apache.spark.deploy.kubernetes.SparkKubernetesClientFactory
-import org.apache.spark.deploy.kubernetes.config._
-import org.apache.spark.deploy.kubernetes.constants._
-import org.apache.spark.deploy.kubernetes.submit.submitsteps.{DriverConfigurationStep, KubernetesDriverSpec}
+import org.apache.spark.deploy.k8s.config._
+import org.apache.spark.deploy.k8s.constants._
+import org.apache.spark.deploy.k8s.submit.submitsteps.{DriverConfigurationStep, KubernetesDriverSpec}
+import org.apache.spark.deploy.k8s.SparkKubernetesClientFactory
 import org.apache.spark.internal.Logging
 import org.apache.spark.util.Utils
 

diff --git a/...bmit/ContainerNameEqualityPredicate.scala → ...bmit/ContainerNameEqualityPredicate.scala b/...bmit/ContainerNameEqualityPredicate.scala → ...bmit/ContainerNameEqualityPredicate.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.lang.Boolean
 

diff --git a/...riverConfigurationStepsOrchestrator.scala → ...riverConfigurationStepsOrchestrator.scala b/...riverConfigurationStepsOrchestrator.scala → ...riverConfigurationStepsOrchestrator.scala
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import org.apache.spark.SparkConf
-import org.apache.spark.deploy.kubernetes.ConfigurationUtils
-import org.apache.spark.deploy.kubernetes.config._
-import org.apache.spark.deploy.kubernetes.constants._
-import org.apache.spark.deploy.kubernetes.submit.submitsteps.{BaseDriverConfigurationStep, DependencyResolutionStep, DriverAddressConfigurationStep, DriverConfigurationStep, DriverKubernetesCredentialsStep, InitContainerBootstrapStep, MountSecretsStep, MountSmallLocalFilesStep, PythonStep}
-import org.apache.spark.deploy.kubernetes.submit.submitsteps.initcontainer.InitContainerConfigurationStepsOrchestrator
+import org.apache.spark.deploy.k8s.ConfigurationUtils
+import org.apache.spark.deploy.k8s.config._
+import org.apache.spark.deploy.k8s.constants._
+import org.apache.spark.deploy.k8s.submit.submitsteps.{BaseDriverConfigurationStep, DependencyResolutionStep, DriverAddressConfigurationStep, DriverConfigurationStep, DriverKubernetesCredentialsStep, InitContainerBootstrapStep, MountSecretsStep, MountSmallLocalFilesStep, PythonStep}
+import org.apache.spark.deploy.k8s.submit.submitsteps.initcontainer.InitContainerConfigurationStepsOrchestrator
 import org.apache.spark.launcher.SparkLauncher
 import org.apache.spark.util.{SystemClock, Utils}
 

diff --git a/...kubernetes/submit/InitContainerUtil.scala → ...deploy/k8s/submit/InitContainerUtil.scala b/...kubernetes/submit/InitContainerUtil.scala → ...deploy/k8s/submit/InitContainerUtil.scala
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import io.fabric8.kubernetes.api.model.{Container, Pod, PodBuilder}
 import scala.collection.JavaConverters._
 
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.constants._
 
 private[spark] object InitContainerUtil {
 

diff --git a/...bernetes/submit/KubernetesFileUtils.scala → ...ploy/k8s/submit/KubernetesFileUtils.scala b/...bernetes/submit/KubernetesFileUtils.scala → ...ploy/k8s/submit/KubernetesFileUtils.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.io.File
 

diff --git a/...etes/submit/LoggingPodStatusWatcher.scala → .../k8s/submit/LoggingPodStatusWatcher.scala b/...etes/submit/LoggingPodStatusWatcher.scala → .../k8s/submit/LoggingPodStatusWatcher.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.util.concurrent.{CountDownLatch, TimeUnit}
 
@@ -27,7 +27,7 @@ import org.apache.spark.SparkException
 import org.apache.spark.internal.Logging
 import org.apache.spark.util.ThreadUtils
 
-private[kubernetes] trait LoggingPodStatusWatcher extends Watcher[Pod] {
+private[k8s] trait LoggingPodStatusWatcher extends Watcher[Pod] {
   def awaitCompletion(): Unit
 }
 
@@ -39,7 +39,7 @@ private[kubernetes] trait LoggingPodStatusWatcher extends Watcher[Pod] {
  * @param maybeLoggingInterval ms between each state request. If provided, must be a positive
  *                             number.
  */
-private[kubernetes] class LoggingPodStatusWatcherImpl(
+private[k8s] class LoggingPodStatusWatcherImpl(
       appId: String, maybeLoggingInterval: Option[Long])
     extends LoggingPodStatusWatcher with Logging {
 

diff --git a/...y/kubernetes/submit/MainAppResource.scala → ...k/deploy/k8s/submit/MainAppResource.scala b/...y/kubernetes/submit/MainAppResource.scala → ...k/deploy/k8s/submit/MainAppResource.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 private[spark] sealed trait MainAppResource
 

diff --git a/...rnetes/submit/MountSecretsBootstrap.scala → ...oy/k8s/submit/MountSecretsBootstrap.scala b/...rnetes/submit/MountSecretsBootstrap.scala → ...oy/k8s/submit/MountSecretsBootstrap.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder}
 

diff --git a/...tes/submit/MountSmallFilesBootstrap.scala → ...k8s/submit/MountSmallFilesBootstrap.scala b/...tes/submit/MountSmallFilesBootstrap.scala → ...k8s/submit/MountSmallFilesBootstrap.scala
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder}
 
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.constants._
 
 private[spark] trait MountSmallFilesBootstrap {
   def mountSmallFilesSecret(pod: Pod, container: Container): (Pod, Container)

diff --git a/...pertiesConfigMapFromScalaMapBuilder.scala → ...pertiesConfigMapFromScalaMapBuilder.scala b/...pertiesConfigMapFromScalaMapBuilder.scala → ...pertiesConfigMapFromScalaMapBuilder.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.io.StringWriter
 import java.util.Properties

diff --git a/...mit/SubmittedDependencyUploaderImpl.scala → ...mit/SubmittedDependencyUploaderImpl.scala b/...mit/SubmittedDependencyUploaderImpl.scala → ...mit/SubmittedDependencyUploaderImpl.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 import java.io.{File, FileOutputStream}
 import javax.ws.rs.core.MediaType
@@ -27,8 +27,8 @@ import okhttp3.RequestBody
 import retrofit2.Call
 
 import org.apache.spark.{SparkException, SSLOptions}
-import org.apache.spark.deploy.kubernetes.CompressionUtils
-import org.apache.spark.deploy.rest.kubernetes.{ResourceStagingServiceRetrofit, RetrofitClientFactory, StagedResourcesOwner, StagedResourcesOwnerType}
+import org.apache.spark.deploy.k8s.CompressionUtils
+import org.apache.spark.deploy.rest.k8s.{ResourceStagingServiceRetrofit, RetrofitClientFactory, StagedResourcesOwner, StagedResourcesOwnerType}
 import org.apache.spark.util.Utils
 
 private[spark] trait SubmittedDependencyUploader {

diff --git a/...ubernetes/submit/SubmittedResources.scala → ...eploy/k8s/submit/SubmittedResources.scala b/...ubernetes/submit/SubmittedResources.scala → ...eploy/k8s/submit/SubmittedResources.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit
+package org.apache.spark.deploy.k8s.submit
 
 case class SubmittedResourceIdAndSecret(resourceId: String, resourceSecret: String)
 

diff --git a/...itsteps/BaseDriverConfigurationStep.scala → ...itsteps/BaseDriverConfigurationStep.scala b/...itsteps/BaseDriverConfigurationStep.scala → ...itsteps/BaseDriverConfigurationStep.scala
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit.submitsteps
+package org.apache.spark.deploy.k8s.submit.submitsteps
 
 import io.fabric8.kubernetes.api.model.{ContainerBuilder, EnvVarBuilder, PodBuilder, QuantityBuilder}
 import scala.collection.JavaConverters._
 
 import org.apache.spark.SparkConf
-import org.apache.spark.deploy.kubernetes.ConfigurationUtils
-import org.apache.spark.deploy.kubernetes.config._
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.ConfigurationUtils
+import org.apache.spark.deploy.k8s.config._
+import org.apache.spark.deploy.k8s.constants._
 
 /**
  * Represents the initial setup required for the driver.

diff --git a/...ubmitsteps/DependencyResolutionStep.scala → ...ubmitsteps/DependencyResolutionStep.scala b/...ubmitsteps/DependencyResolutionStep.scala → ...ubmitsteps/DependencyResolutionStep.scala
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit.submitsteps
+package org.apache.spark.deploy.k8s.submit.submitsteps
 
 
 import java.io.File
 
 import io.fabric8.kubernetes.api.model.ContainerBuilder
 
-import org.apache.spark.deploy.kubernetes.constants._
-import org.apache.spark.deploy.kubernetes.submit.KubernetesFileUtils
-import org.apache.spark.deploy.kubernetes.submit.submitsteps.initcontainer.InitContainerConfigurationStep
+import org.apache.spark.deploy.k8s.constants._
+import org.apache.spark.deploy.k8s.submit.KubernetesFileUtils
+import org.apache.spark.deploy.k8s.submit.submitsteps.initcontainer.InitContainerConfigurationStep
 import org.apache.spark.util.Utils
 
 /**

diff --git a/...teps/DriverAddressConfigurationStep.scala → ...teps/DriverAddressConfigurationStep.scala b/...teps/DriverAddressConfigurationStep.scala → ...teps/DriverAddressConfigurationStep.scala
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit.submitsteps
+package org.apache.spark.deploy.k8s.submit.submitsteps
 
 import io.fabric8.kubernetes.api.model.ServiceBuilder
 import scala.collection.JavaConverters._
 
 import org.apache.spark.SparkConf
-import org.apache.spark.deploy.kubernetes.config._
-import org.apache.spark.deploy.kubernetes.constants._
+import org.apache.spark.deploy.k8s.config._
+import org.apache.spark.deploy.k8s.constants._
 import org.apache.spark.internal.Logging
 import org.apache.spark.util.Clock
 

diff --git a/...submitsteps/DriverConfigurationStep.scala → ...submitsteps/DriverConfigurationStep.scala b/...submitsteps/DriverConfigurationStep.scala → ...submitsteps/DriverConfigurationStep.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.kubernetes.submit.submitsteps
+package org.apache.spark.deploy.k8s.submit.submitsteps
 
 /**
  * Represents a step in preparing the Kubernetes driver.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.apache.spark.scheduler.cluster.kubernetes.KubernetesClusterManager
		org.apache.spark.scheduler.cluster.k8s.KubernetesClusterManager