Skip to content

Commit

Permalink
Tca 100 (#54)
Browse files Browse the repository at this point in the history
* spark 3.5.1  image update
* update docker ref for spark 3.5
  • Loading branch information
tcarland authored Mar 18, 2024
1 parent bb5a6c1 commit 4999a1b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 84 deletions.
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: spark-hs
description: A Helm Chart for the Spark History Server
type: application
version: 0.9.8
appVersion: 3.3.4
version: 1.0.0
appVersion: 3.5.1
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,21 @@ The typical image build process:
```bash
export SPARK_HOME=/opt/spark
cd $SPARK_HOME
./bin/docker-image-tool.sh -r quay.io/myacct -t 3.3.4-myrelease build
./bin/docker-image-tool.sh -r quay.io/myacct -t 3.5.1-myrelease build
[...]
Successfully build f07cd00df877
Successfully tagged quay.io/myacct/spark:3.3.4-myrelease
Successfully tagged quay.io/myacct/spark:3.5.1-myrelease
```

### Scala Versions

In the context of the history server, the underlying Scala version
does not really matter, though Spark 3 can support either 2.12 or 2.13.
does not really matter, Spark 3 supports either 2.12 or 2.13.
It can be useful to tag the image accordingly as this version is
key when it comes to other 3rd party Scala dependencies such as Iceberg
or Hudi. Unfortunately, some 3rd party projects have not fully adopted
Scala 2.13 yet (eg. Hudi, Flink). The default images provided here are
built using 2.13 so do not support Hudi, but do support Iceberg.
built using 2.13.

<br>

Expand Down
2 changes: 1 addition & 1 deletion argo/spark-hs-argo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
value: "$TRUSTSTORE_PASSWD"
chart: spark-hs
repoURL: https://tcarland.github.io/spark-hs-chart/
targetRevision: 0.9.8
targetRevision: 1.0.0
syncPolicy:
syncOptions:
- CreateNamespace=true
72 changes: 0 additions & 72 deletions container/Dockerfile-v3.3.3

This file was deleted.

9 changes: 5 additions & 4 deletions container/Dockerfile-v3.3.4 → container/Dockerfile-v3.5.1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
ARG spark_version=3.3.4
ARG spark_uid=185
ARG hive_uri=https://downloads.apache.org

Expand All @@ -33,12 +32,14 @@ RUN set -ex && \
echo ${spark_version} > /opt/spark/RELEASE && \
rm /bin/sh && \
ln -sv /bin/bash /bin/sh && \
useradd -u ${spark_uid} -m spark && \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \
chgrp root /etc/passwd && chmod ug+rw /etc/passwd && \
rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/*


COPY jars /opt/spark/jars
COPY RELEASE /opt/spark/RELEASE
COPY bin /opt/spark/bin
COPY sbin /opt/spark/sbin
COPY kubernetes/dockerfiles/spark/entrypoint.sh /opt/
Expand All @@ -54,10 +55,10 @@ RUN curl ${hive_uri}/hive/hive-3.1.3/apache-hive-3.1.3-bin.tar.gz \
ENV SPARK_HOME /opt/spark

WORKDIR /opt/spark/work-dir
RUN chmod g+w /opt/spark/work-dir
RUN chmod a+x /opt/decom.sh
RUN chown spark:spark /opt/spark/work-dir && \
chmod g+w /opt/spark/work-dir && \
chmod a+x /opt/decom.sh

ENTRYPOINT [ "/opt/entrypoint.sh" ]

# Specify the User that the actual main process will run as
USER ${spark_uid}
2 changes: 1 addition & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replicaCount: 1

image:
repository: quay.io/tcarland/spark
tag: v3.3.4-tethys-2402.18
tag: v3.5.1-elara-2403.12
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down

0 comments on commit 4999a1b

Please sign in to comment.