Skip to content

[SPARK-46770][K8S][TESTS] Remove legacy docker-for-desktop logic #44796

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
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-46770][K8S][TESTS] Remove legacy docker-for-desktop logic #44796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ then
fi
;;

docker-desktop | docker-for-desktop)
docker-desktop)
# Only need to build as this will place it in our local Docker repo which is all
# we need for Docker for Desktop to work so no need to also push
$SPARK_INPUT_DIR/bin/docker-image-tool.sh -r $IMAGE_REPO -t $IMAGE_TAG $JAVA_IMAGE_TAG_BUILD_ARG $LANGUAGE_BINDING_BUILD_ARGS build
Expand Down
2 changes: 1 addition & 1 deletion ...ation-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/PVTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private[spark] trait PVTestsSuite { k8sSuite: KubernetesSuite =>
.withMatchExpressions(new NodeSelectorRequirementBuilder()
.withKey("kubernetes.io/hostname")
.withOperator("In")
.withValues("minikube", "m01", "docker-for-desktop", "docker-desktop")
.withValues("minikube", "m01", "docker-desktop")
.build()).build())
.endRequired()
.endNodeAffinity()
Expand Down
1 change: 0 additions & 1 deletion ...tion-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/TestConstants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package org.apache.spark.deploy.k8s.integrationtest

object TestConstants {
val BACKEND_MINIKUBE = "minikube"
val BACKEND_DOCKER_FOR_DESKTOP = "docker-for-desktop"
val BACKEND_DOCKER_DESKTOP = "docker-desktop"
val BACKEND_CLOUD = "cloud"

Expand Down
2 changes: 1 addition & 1 deletion ...st/scala/org/apache/spark/deploy/k8s/integrationtest/backend/IntegrationTestBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private[spark] object IntegrationTestBackendFactory {
case BACKEND_MINIKUBE => MinikubeTestBackend
case BACKEND_CLOUD =>
new KubeConfigBackend(System.getProperty(CONFIG_KEY_KUBE_CONFIG_CONTEXT))
case BACKEND_DOCKER_FOR_DESKTOP | BACKEND_DOCKER_DESKTOP => DockerForDesktopBackend
case BACKEND_DOCKER_DESKTOP => DockerForDesktopBackend
case _ => throw new IllegalArgumentException("Invalid " +
CONFIG_KEY_DEPLOY_MODE + ": " + deployMode)
}
Expand Down