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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)