feat(build): spark 3.5.2 #42
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| export IMAGE_NAME=spark-k8s | ||
| export SELF_VERSION="v4" | ||
| export SCALA_VERSION="2.12" | ||
| export SPARK_VERSION="3.5.2" | ||
| export HADOOP_VERSION="3.3.6" | ||
| export JAVA_VERSION="8" | ||
| export WITH_HIVE="true" | ||
| export WITH_PYSPARK="true" | ||
| bash make-distribution.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,57 +40,25 @@ TERM=xterm-color ./dev/make-distribution.sh \ | |
| ${HIVE_INSTALL_FLAG:+"-Phive"} \ | ||
| -DskipTests | ||
|
|
||
|
There was a problem hiding this comment. not needed anymore as we no longer use any spark version that is 2.y.z |
||
| SPARK_MAJOR_VERSION="$(echo "${SPARK_VERSION}" | cut -d '.' -f1)" | ||
| SPARK_MINOR_VERSION="$(echo "${SPARK_VERSION}" | cut -d '.' -f2)" | ||
| HADOOP_MAJOR_VERSION="$(echo "${HADOOP_VERSION}" | cut -d '.' -f1)" | ||
|
|
||
|
There was a problem hiding this comment. not needed anymore as we no longer use any spark version that is 2.y.z |
||
| DOCKERFILE_BASE="./resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile" | ||
| DOCKERFILE_PY="./resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile" | ||
|
|
||
| if [[ ${SPARK_MAJOR_VERSION} -eq 3 && ${SPARK_MINOR_VERSION} -ge 4 ]]; then # >=3.4 | ||
| # From Spark v3.4.0 onwards, openjdk is not the prefered base image source as it i | ||
| # deprecated and taken over by eclipse-temurin. slim-buster variants are not available | ||
| # on eclipse-temurin at the moment. | ||
|
There was a problem hiding this comment.
|
||
| IMAGE_VARIANT="jre-focal" | ||
| else | ||
| IMAGE_VARIANT="jre-slim-buster" | ||
| fi | ||
|
|
||
| SPARK_LABEL="${SPARK_VERSION}" | ||
| TAG_NAME="${SELF_VERSION}_${SPARK_LABEL}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}" | ||
|
|
||
|
|
||
| ./bin/docker-image-tool.sh \ | ||
| -b java_image_tag=${JAVA_VERSION}-${IMAGE_VARIANT} \ | ||
| -r "${IMAGE_NAME}" \ | ||
|
|
@@ -101,6 +69,5 @@ TAG_NAME="${SELF_VERSION}_${SPARK_LABEL}_hadoop-${HADOOP_VERSION}_scala-${SCALA_ | |
|
|
||
| docker tag "${IMAGE_NAME}/spark:${TAG_NAME}" "${IMAGE_NAME}:${TAG_NAME}" | ||
| docker tag "${IMAGE_NAME}/spark-py:${TAG_NAME}" "${IMAGE_NAME}-py:${TAG_NAME}" | ||
|
|
||
| popd >/dev/null | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,21 +11,10 @@ else | |
| fi | ||
|
|
||
| TAG_NAME="${SELF_VERSION}_${SPARK_LABEL}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}" | ||
|
|
||
|
There was a problem hiding this comment. to only use image tags that has self version to prevent overwritten previously working images when rebuild with new base jre images |
||
| docker tag "${IMAGE_NAME}:${TAG_NAME}" "test_${IMAGE_ORG}/${IMAGE_NAME}:${TAG_NAME}" | ||
|
There was a problem hiding this comment. ah thanks for the catch 6c00c0e |
||
| docker push "${IMAGE_ORG}/${IMAGE_NAME}:${TAG_NAME}" | ||
|
|
||
| # Python image push | ||
| docker tag "${IMAGE_NAME}-py:${TAG_NAME}" "test_${IMAGE_ORG}/${IMAGE_NAME}-py:${TAG_NAME}" | ||
| docker push "${IMAGE_ORG}/${IMAGE_NAME}-py:${TAG_NAME}" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol i'm pretty sure this guy (Chao Sun) who reported the issue was a singaporean colleague at my previous company
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Time to drop him a message to share with him how to fix