Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 7477cbe

Browse files
foxishfoxish
authored
Rename package to k8s (#497)
* Rename package to k8s * Rename string constants
1 parent 8a0f485 commit 7477cbe

File tree

116 files changed

+262
-263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+262
-263
lines changed

‎core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ object SparkSubmit extends CommandLineUtils {
635635
}
636636

637637
if (isKubernetesCluster) {
638-
childMainClass = "org.apache.spark.deploy.kubernetes.submit.Client"
638+
childMainClass = "org.apache.spark.deploy.k8s.submit.Client"
639639
if (args.isPython) {
640640
childArgs ++= Array("--primary-py-file", args.primaryResource)
641641
childArgs ++= Array("--main-class", "org.apache.spark.deploy.PythonRunner")

‎dev/.rat-excludes

+1-2
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,4 @@ org.apache.spark.scheduler.ExternalClusterManager
105105
org.apache.spark.deploy.yarn.security.ServiceCredentialProvider
106106
spark-warehouse
107107
structured-streaming/*
108-
kafka-source-initial-offset-version-2.1.0.bin
109-
org.apache.spark.deploy.kubernetes.submit.v1.DriverServiceManager
108+
kafka-source-initial-offset-version-2.1.0.bin

‎resource-managers/kubernetes/core/src/main/resources/META-INF/services/org.apache.spark.scheduler.ExternalClusterManager

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.apache.spark.scheduler.cluster.kubernetes.KubernetesClusterManager
1+
org.apache.spark.scheduler.cluster.k8s.KubernetesClusterManager

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/CompressionUtils.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/CompressionUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import java.io.{File, FileInputStream, FileOutputStream, InputStream, OutputStream}
2020
import java.util.zip.{GZIPInputStream, GZIPOutputStream}

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/ConfigurationUtils.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/ConfigurationUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.spark.deploy.kubernetes
18+
package org.apache.spark.deploy.k8s
1919

2020
import org.apache.spark.{SparkConf, SparkException}
2121
import org.apache.spark.internal.Logging

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/InitContainerResourceStagingServerSecretPlugin.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/InitContainerResourceStagingServerSecretPlugin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder, Secret}
2020

21-
import org.apache.spark.deploy.kubernetes.constants._
21+
import org.apache.spark.deploy.k8s.constants._
2222

2323
private[spark] trait InitContainerResourceStagingServerSecretPlugin {
2424

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesCredentials.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesCredentials.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
case class KubernetesCredentials(
2020
oauthTokenBase64: Option[String],

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesExternalShuffleService.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesExternalShuffleService.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.spark.deploy.kubernetes
18+
package org.apache.spark.deploy.k8s
1919

2020
import java.io.File
2121
import java.nio.ByteBuffer
@@ -29,8 +29,8 @@ import scala.collection.mutable
2929

3030
import org.apache.spark.{SecurityManager, SparkConf}
3131
import org.apache.spark.deploy.ExternalShuffleService
32-
import org.apache.spark.deploy.kubernetes.config._
33-
import org.apache.spark.deploy.kubernetes.constants._
32+
import org.apache.spark.deploy.k8s.config._
33+
import org.apache.spark.deploy.k8s.constants._
3434
import org.apache.spark.internal.Logging
3535
import org.apache.spark.network.client.{RpcResponseCallback, TransportClient}
3636
import org.apache.spark.network.shuffle.ExternalShuffleBlockHandler

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/OptionRequirements.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/OptionRequirements.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
private[spark] object OptionRequirements {
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/PodWithDetachedInitContainer.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/PodWithDetachedInitContainer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import io.fabric8.kubernetes.api.model.{Container, Pod}
2020

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import java.io.File
2020

@@ -25,7 +25,7 @@ import io.fabric8.kubernetes.client.utils.HttpClientUtils
2525
import okhttp3.Dispatcher
2626

2727
import org.apache.spark.SparkConf
28-
import org.apache.spark.deploy.kubernetes.config._
28+
import org.apache.spark.deploy.k8s.config._
2929
import org.apache.spark.util.ThreadUtils
3030

3131
/**

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/SparkPodInitContainerBootstrap.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/SparkPodInitContainerBootstrap.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import io.fabric8.kubernetes.api.model.{ContainerBuilder, EmptyDirVolumeSource, PodBuilder, VolumeMount, VolumeMountBuilder}
2020

21-
import org.apache.spark.deploy.kubernetes.constants._
21+
import org.apache.spark.deploy.k8s.constants._
2222

2323
/**
2424
* This is separated out from the init-container steps API because this component can be reused to

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/config.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/config.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
import java.util.concurrent.TimeUnit
2020

2121
import org.apache.spark.{SPARK_VERSION => sparkVersion}
22-
import org.apache.spark.deploy.kubernetes.constants._
22+
import org.apache.spark.deploy.k8s.constants._
2323
import org.apache.spark.internal.Logging
2424
import org.apache.spark.internal.config.ConfigBuilder
2525
import org.apache.spark.network.util.ByteUnit

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/constants.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/constants.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes
17+
package org.apache.spark.deploy.k8s
1818

1919
package object constants {
2020
// Labels

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/Client.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/Client.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import java.util.{Collections, UUID}
2020

@@ -24,10 +24,10 @@ import scala.collection.mutable
2424
import scala.collection.JavaConverters._
2525

2626
import org.apache.spark.SparkConf
27-
import org.apache.spark.deploy.kubernetes.config._
28-
import org.apache.spark.deploy.kubernetes.constants._
29-
import org.apache.spark.deploy.kubernetes.submit.submitsteps.{DriverConfigurationStep, KubernetesDriverSpec}
30-
import org.apache.spark.deploy.kubernetes.SparkKubernetesClientFactory
27+
import org.apache.spark.deploy.k8s.config._
28+
import org.apache.spark.deploy.k8s.constants._
29+
import org.apache.spark.deploy.k8s.submit.submitsteps.{DriverConfigurationStep, KubernetesDriverSpec}
30+
import org.apache.spark.deploy.k8s.SparkKubernetesClientFactory
3131
import org.apache.spark.internal.Logging
3232
import org.apache.spark.util.Utils
3333

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/ContainerNameEqualityPredicate.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/ContainerNameEqualityPredicate.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import java.lang.Boolean
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/DriverConfigurationStepsOrchestrator.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/DriverConfigurationStepsOrchestrator.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import org.apache.spark.SparkConf
20-
import org.apache.spark.deploy.kubernetes.ConfigurationUtils
21-
import org.apache.spark.deploy.kubernetes.config._
22-
import org.apache.spark.deploy.kubernetes.constants._
23-
import org.apache.spark.deploy.kubernetes.submit.submitsteps.{BaseDriverConfigurationStep, DependencyResolutionStep, DriverAddressConfigurationStep, DriverConfigurationStep, DriverKubernetesCredentialsStep, InitContainerBootstrapStep, MountSecretsStep, MountSmallLocalFilesStep, PythonStep}
24-
import org.apache.spark.deploy.kubernetes.submit.submitsteps.initcontainer.InitContainerConfigurationStepsOrchestrator
20+
import org.apache.spark.deploy.k8s.ConfigurationUtils
21+
import org.apache.spark.deploy.k8s.config._
22+
import org.apache.spark.deploy.k8s.constants._
23+
import org.apache.spark.deploy.k8s.submit.submitsteps.{BaseDriverConfigurationStep, DependencyResolutionStep, DriverAddressConfigurationStep, DriverConfigurationStep, DriverKubernetesCredentialsStep, InitContainerBootstrapStep, MountSecretsStep, MountSmallLocalFilesStep, PythonStep}
24+
import org.apache.spark.deploy.k8s.submit.submitsteps.initcontainer.InitContainerConfigurationStepsOrchestrator
2525
import org.apache.spark.launcher.SparkLauncher
2626
import org.apache.spark.util.{SystemClock, Utils}
2727

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/InitContainerUtil.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/InitContainerUtil.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import com.fasterxml.jackson.databind.ObjectMapper
2020
import com.fasterxml.jackson.module.scala.DefaultScalaModule
2121
import io.fabric8.kubernetes.api.model.{Container, Pod, PodBuilder}
2222
import scala.collection.JavaConverters._
2323

24-
import org.apache.spark.deploy.kubernetes.constants._
24+
import org.apache.spark.deploy.k8s.constants._
2525

2626
private[spark] object InitContainerUtil {
2727

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/KubernetesFileUtils.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesFileUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import java.io.File
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/LoggingPodStatusWatcher.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/LoggingPodStatusWatcher.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import java.util.concurrent.{CountDownLatch, TimeUnit}
2020

@@ -27,7 +27,7 @@ import org.apache.spark.SparkException
2727
import org.apache.spark.internal.Logging
2828
import org.apache.spark.util.ThreadUtils
2929

30-
private[kubernetes] trait LoggingPodStatusWatcher extends Watcher[Pod] {
30+
private[k8s] trait LoggingPodStatusWatcher extends Watcher[Pod] {
3131
def awaitCompletion(): Unit
3232
}
3333

@@ -39,7 +39,7 @@ private[kubernetes] trait LoggingPodStatusWatcher extends Watcher[Pod] {
3939
* @param maybeLoggingInterval ms between each state request. If provided, must be a positive
4040
* number.
4141
*/
42-
private[kubernetes] class LoggingPodStatusWatcherImpl(
42+
private[k8s] class LoggingPodStatusWatcherImpl(
4343
appId: String, maybeLoggingInterval: Option[Long])
4444
extends LoggingPodStatusWatcher with Logging {
4545

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/MainAppResource.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/MainAppResource.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
private[spark] sealed trait MainAppResource
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/MountSecretsBootstrap.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/MountSecretsBootstrap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder}
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/MountSmallFilesBootstrap.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/MountSmallFilesBootstrap.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder}
2020

21-
import org.apache.spark.deploy.kubernetes.constants._
21+
import org.apache.spark.deploy.k8s.constants._
2222

2323
private[spark] trait MountSmallFilesBootstrap {
2424
def mountSmallFilesSecret(pod: Pod, container: Container): (Pod, Container)

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/PropertiesConfigMapFromScalaMapBuilder.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/PropertiesConfigMapFromScalaMapBuilder.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.spark.deploy.kubernetes.submit
18+
package org.apache.spark.deploy.k8s.submit
1919

2020
import java.io.StringWriter
2121
import java.util.Properties

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/SubmittedDependencyUploaderImpl.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/SubmittedDependencyUploaderImpl.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
import java.io.{File, FileOutputStream}
2020
import javax.ws.rs.core.MediaType
@@ -27,8 +27,8 @@ import okhttp3.RequestBody
2727
import retrofit2.Call
2828

2929
import org.apache.spark.{SparkException, SSLOptions}
30-
import org.apache.spark.deploy.kubernetes.CompressionUtils
31-
import org.apache.spark.deploy.rest.kubernetes.{ResourceStagingServiceRetrofit, RetrofitClientFactory, StagedResourcesOwner, StagedResourcesOwnerType}
30+
import org.apache.spark.deploy.k8s.CompressionUtils
31+
import org.apache.spark.deploy.rest.k8s.{ResourceStagingServiceRetrofit, RetrofitClientFactory, StagedResourcesOwner, StagedResourcesOwnerType}
3232
import org.apache.spark.util.Utils
3333

3434
private[spark] trait SubmittedDependencyUploader {

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/SubmittedResources.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/SubmittedResources.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit
17+
package org.apache.spark.deploy.k8s.submit
1818

1919
case class SubmittedResourceIdAndSecret(resourceId: String, resourceSecret: String)
2020

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/submitsteps/BaseDriverConfigurationStep.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/submitsteps/BaseDriverConfigurationStep.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit.submitsteps
17+
package org.apache.spark.deploy.k8s.submit.submitsteps
1818

1919
import io.fabric8.kubernetes.api.model.{ContainerBuilder, EnvVarBuilder, PodBuilder, QuantityBuilder}
2020
import scala.collection.JavaConverters._
2121

2222
import org.apache.spark.SparkConf
23-
import org.apache.spark.deploy.kubernetes.ConfigurationUtils
24-
import org.apache.spark.deploy.kubernetes.config._
25-
import org.apache.spark.deploy.kubernetes.constants._
23+
import org.apache.spark.deploy.k8s.ConfigurationUtils
24+
import org.apache.spark.deploy.k8s.config._
25+
import org.apache.spark.deploy.k8s.constants._
2626

2727
/**
2828
* Represents the initial setup required for the driver.

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/submitsteps/DependencyResolutionStep.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/submitsteps/DependencyResolutionStep.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit.submitsteps
17+
package org.apache.spark.deploy.k8s.submit.submitsteps
1818

1919

2020
import java.io.File
2121

2222
import io.fabric8.kubernetes.api.model.ContainerBuilder
2323

24-
import org.apache.spark.deploy.kubernetes.constants._
25-
import org.apache.spark.deploy.kubernetes.submit.KubernetesFileUtils
26-
import org.apache.spark.deploy.kubernetes.submit.submitsteps.initcontainer.InitContainerConfigurationStep
24+
import org.apache.spark.deploy.k8s.constants._
25+
import org.apache.spark.deploy.k8s.submit.KubernetesFileUtils
26+
import org.apache.spark.deploy.k8s.submit.submitsteps.initcontainer.InitContainerConfigurationStep
2727
import org.apache.spark.util.Utils
2828

2929
/**

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/submitsteps/DriverAddressConfigurationStep.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/submitsteps/DriverAddressConfigurationStep.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit.submitsteps
17+
package org.apache.spark.deploy.k8s.submit.submitsteps
1818

1919
import io.fabric8.kubernetes.api.model.ServiceBuilder
2020
import scala.collection.JavaConverters._
2121

2222
import org.apache.spark.SparkConf
23-
import org.apache.spark.deploy.kubernetes.config._
24-
import org.apache.spark.deploy.kubernetes.constants._
23+
import org.apache.spark.deploy.k8s.config._
24+
import org.apache.spark.deploy.k8s.constants._
2525
import org.apache.spark.internal.Logging
2626
import org.apache.spark.util.Clock
2727

‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/submitsteps/DriverConfigurationStep.scala renamed to ‎resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/submitsteps/DriverConfigurationStep.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.spark.deploy.kubernetes.submit.submitsteps
17+
package org.apache.spark.deploy.k8s.submit.submitsteps
1818

1919
/**
2020
* Represents a step in preparing the Kubernetes driver.

0 commit comments

Comments
 (0)