Skip to content

Commit

Permalink
[KYUUBI #5941] Drop Kubernetes Block Cleaner Tool from Kyuubi
Browse files Browse the repository at this point in the history
  • Loading branch information
zwangsheng committed Jan 3, 2024
1 parent e6b1bf7 commit 17c01ff
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 709 deletions.
6 changes: 2 additions & 4 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@
'.dockerignore',
'bin/docker-image-tool.sh',
'docker/**/*',
'integration-tests/kyuubi-kubernetes-it/**/*',
'tools/spark-block-cleaner/**/*'
'integration-tests/kyuubi-kubernetes-it/**/*'
]

"module:metrics":
Expand Down Expand Up @@ -164,8 +163,7 @@
- changed-files:
- any-glob-to-any-file: [
'externals/kyuubi-spark-sql-engine/**/*',
'extensions/spark/**/*',
'tools/spark-block-cleaner/**/*'
'extensions/spark/**/*'
]

"module:extensions":
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
check-latest: false
- run: >-
build/mvn org.apache.rat:apache-rat-plugin:check
-Ptpcds -Pspark-block-cleaner -Pkubernetes-it
-Pspark-3.1 -Pspark-3.2 -Pspark-3.3 -Pspark-3.4 -Pspark-3.5
-Ptpcds -Pkubernetes-it -Pspark-3.1
-Pspark-3.2 -Pspark-3.3 -Pspark-3.4 -Pspark-3.5
- name: Upload rat report
if: failure()
uses: actions/upload-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
profiles:
- '-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.5,spark-3.4,spark-3.3,spark-3.2,tpcds,kubernetes-it'
- '-Pflink-provided,hive-provided,spark-provided,spark-3.5,spark-3.4,spark-3.3,spark-3.2,tpcds,kubernetes-it'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
if: steps.modules-check.conclusion == 'success' && steps.modules-check.outcome == 'failure'
run: |
MVN_OPT="-DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip"
build/mvn clean install ${MVN_OPT} -Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.2,tpcds
build/mvn clean install ${MVN_OPT} -Pflink-provided,hive-provided,spark-provided,spark-3.2,tpcds
build/mvn clean install ${MVN_OPT} -pl extensions/spark/kyuubi-extension-spark-3-1 -Pspark-3.1
build/mvn clean install ${MVN_OPT} -pl extensions/spark/kyuubi-extension-spark-3-3,extensions/spark/kyuubi-spark-connector-hive -Pspark-3.3
build/mvn clean install ${MVN_OPT} -pl extensions/spark/kyuubi-extension-spark-3-4 -Pspark-3.4
Expand Down
8 changes: 0 additions & 8 deletions build/dist
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,6 @@ for jar in $(ls "$DISTDIR/jars/"); do
fi
done

# Copy kyuubi tools
if [[ -f "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner_${SCALA_VERSION}-${VERSION}.jar" ]]; then
mkdir -p "$DISTDIR/tools/spark-block-cleaner/kubernetes"
mkdir -p "$DISTDIR/tools/spark-block-cleaner/jars"
cp -r "$KYUUBI_HOME"/tools/spark-block-cleaner/kubernetes/* "$DISTDIR/tools/spark-block-cleaner/kubernetes/"
cp "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/tools/spark-block-cleaner/jars/"
fi

# Copy Kyuubi Spark extension
SPARK_EXTENSION_VERSIONS=('3-1' '3-2' '3-3' '3-4' '3-5')
# shellcheck disable=SC2068
Expand Down
2 changes: 1 addition & 1 deletion dev/reformat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -x

KYUUBI_HOME="$(cd "`dirname "$0"`/.."; pwd)"

PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.5,spark-3.4,spark-3.3,spark-3.2,spark-3.1,tpcds,kubernetes-it"
PROFILES="-Pflink-provided,hive-provided,spark-provided,spark-3.5,spark-3.4,spark-3.3,spark-3.2,spark-3.1,tpcds,kubernetes-it"

# python style checks rely on `black` in path
if ! command -v black &> /dev/null
Expand Down
1 change: 0 additions & 1 deletion docs/tools/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ Tools
.. toctree::
:maxdepth: 2

spark_block_cleaner
kyuubi-ctl
kyuubi-admin
135 changes: 0 additions & 135 deletions docs/tools/spark_block_cleaner.md

This file was deleted.

7 changes: 0 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2376,13 +2376,6 @@
</properties>
</profile>

<profile>
<id>spark-block-cleaner</id>
<modules>
<module>tools/spark-block-cleaner</module>
</modules>
</profile>

<profile>
<id>spotless-python</id>
<properties>
Expand Down
34 changes: 0 additions & 34 deletions tools/spark-block-cleaner/kubernetes/docker/Dockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions tools/spark-block-cleaner/kubernetes/docker/entrypoint.sh

This file was deleted.

75 changes: 0 additions & 75 deletions tools/spark-block-cleaner/kubernetes/spark-block-cleaner.yml

This file was deleted.

Loading

0 comments on commit 17c01ff

Please sign in to comment.