Skip to content

[SPARK-22948][k8s] Move SparkPodInitContainer to correct package. #20156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-22948][k8s] Move SparkPodInitContainer to correct package. #20156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a09a728
[SPARK-22948][k8s] Move SparkPodInitContainer to correct package.
Jan 4, 2018
edc3e18
Adjust kubernetes directory to avoid running all tests when not needed.
Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/sparktestsupport/modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def __hash__(self):
kubernetes = Module(
name="kubernetes",
dependencies=[],
source_file_regexes=["resource-managers/kubernetes/core"],
source_file_regexes=["resource-managers/kubernetes"],
Copy link
Contributor

@liyinan926 liyinan926 Jan 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Contributor Author

@vanzin vanzin Jan 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise when you change something outside of kubernetes/core (like the docker files), all unit tests will be run, not just the stuff related to k8s.

I requested this change in the original PR but you guys never addressed it.

Copy link
Contributor

@liyinan926 liyinan926 Jan 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry the comment was not caught by us.

build_profile_flags=["-Pkubernetes"],
sbt_test_goals=["kubernetes/test"]
)
Expand Down
2 changes: 1 addition & 1 deletion ...ploy/rest/k8s/SparkPodInitContainer.scala → ...rk/deploy/k8s/SparkPodInitContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.spark.deploy.rest.k8s
package org.apache.spark.deploy.k8s

import java.io.File
import java.util.concurrent.TimeUnit
Expand Down
2 changes: 1 addition & 1 deletion ...rest/k8s/SparkPodInitContainerSuite.scala → ...ploy/k8s/SparkPodInitContainerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.spark.deploy.rest.k8s
package org.apache.spark.deploy.k8s

import java.io.File
import java.util.UUID
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ FROM spark-base
# command should be invoked from the top level directory of the Spark distribution. E.g.:
# docker build -t spark-init:latest -f kubernetes/dockerfiles/init-container/Dockerfile .

ENTRYPOINT [ "/opt/entrypoint.sh", "/opt/spark/bin/spark-class", "org.apache.spark.deploy.rest.k8s.SparkPodInitContainer" ]
ENTRYPOINT [ "/opt/entrypoint.sh", "/opt/spark/bin/spark-class", "org.apache.spark.deploy.k8s.SparkPodInitContainer" ]