Skip to content

Commit 78b34b4

Browse files
authored
Fix publish after k8s rebase (apache-spark-on-k8s#347)
1 parent 2223db0 commit 78b34b4

File tree

6 files changed

+2
-270
lines changed

6 files changed

+2
-270
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ workflows:
432432
- build-maven
433433
- build-sbt
434434
# Tests
435+
- run-style-tests
435436
- run-build-tests
436437
- run-backcompat-tests
437438
- run-scala-tests

conf/k8s-shuffle-service-rbac.yaml

Lines changed: 0 additions & 80 deletions
This file was deleted.

conf/k8s-spark-rbac.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.

conf/kubernetes-resource-staging-server.yaml

Lines changed: 0 additions & 79 deletions
This file was deleted.

conf/kubernetes-shuffle-service.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

dev/make-distribution.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ fi
202202
# Only create and copy the dockerfiles directory if the kubernetes artifacts were built.
203203
if [ -d "$SPARK_HOME"/resource-managers/kubernetes/core/target/ ]; then
204204
mkdir -p "$DISTDIR/kubernetes/"
205-
cp -a "$SPARK_HOME"/resource-managers/kubernetes/docker-minimal-bundle/src/main/docker/ "$DISTDIR/kubernetes"
205+
cp -a "$SPARK_HOME"/resource-managers/kubernetes/docker/src/main/dockerfiles "$DISTDIR/kubernetes/"
206206
fi
207207

208208
# Copy examples and dependencies
@@ -270,7 +270,6 @@ fi
270270
# Copy other things
271271
mkdir "$DISTDIR/conf"
272272
cp "$SPARK_HOME"/conf/*.template "$DISTDIR/conf"
273-
cp "$SPARK_HOME"/conf/*.yaml "$DISTDIR/conf"
274273
cp "$SPARK_HOME/README.md" "$DISTDIR"
275274
cp -r "$SPARK_HOME/bin" "$DISTDIR"
276275
cp -r "$SPARK_HOME/python" "$DISTDIR"

0 commit comments

Comments
 (0)