Skip to content

Commit 0609dcc

Browse files
foxishMarcelo Vanzin
authored andcommitted
[SPARK-22777][SCHEDULER] Kubernetes mode dockerfile permission and distribution
# What changes were proposed in this pull request? 1. entrypoint.sh for Kubernetes spark-base image is marked as executable (644 -> 755) 2. make-distribution script will now create kubernetes/dockerfiles directory when Kubernetes support is compiled. ## How was this patch tested? Manual testing cc/ ueshin jiangxb1987 mridulm vanzin rxin liyinan926 Author: foxish <[email protected]> Closes #20007 from foxish/fix-dockerfiles.
1 parent 3a07eff commit 0609dcc

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

dev/make-distribution.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,18 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE"
168168
# Copy jars
169169
cp "$SPARK_HOME"/assembly/target/scala*/jars/* "$DISTDIR/jars/"
170170

171-
# Only create the yarn directory if the yarn artifacts were build.
171+
# Only create the yarn directory if the yarn artifacts were built.
172172
if [ -f "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar ]; then
173173
mkdir "$DISTDIR/yarn"
174174
cp "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/yarn"
175175
fi
176176

177+
# Only create and copy the dockerfiles directory if the kubernetes artifacts were built.
178+
if [ -d "$SPARK_HOME"/resource-managers/kubernetes/core/target/ ]; then
179+
mkdir -p "$DISTDIR/kubernetes/"
180+
cp -a "$SPARK_HOME"/resource-managers/kubernetes/docker/src/main/dockerfiles "$DISTDIR/kubernetes/"
181+
fi
182+
177183
# Copy examples and dependencies
178184
mkdir -p "$DISTDIR/examples/jars"
179185
cp "$SPARK_HOME"/examples/target/scala*/jars/* "$DISTDIR/examples/jars"

resource-managers/kubernetes/docker/src/main/dockerfiles/spark-base/entrypoint.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)