From cf6cbd87f833a1497261f74872eb9a255466e3f9 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 10 Jan 2023 18:02:43 +0100
Subject: [PATCH] [bitnami/spark] Release 3.3.1-debian-11-r27 (#19770)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/spark/3.3/debian-11/Dockerfile        |  2 +-
 .../opt/bitnami/scripts/libversion.sh         |  2 +-
 .../rootfs/opt/bitnami/scripts/libspark.sh    |  1 +
 .../opt/bitnami/scripts/spark/entrypoint.sh   | 20 +++++++++----------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile
index cfc13f6976d6..8bcb595029ed 100644
--- a/bitnami/spark/3.3/debian-11/Dockerfile
+++ b/bitnami/spark/3.3/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="3.3.1-debian-11-r26" \
+      org.opencontainers.image.ref.name="3.3.1-debian-11-r27" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index f3bc7568bfa5..ad2f0eee48df 100644
--- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -31,7 +31,7 @@ get_sematic_version () {
 
         while [[ $i -lt $n ]]; do
             if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
+                version_sections[j]="${BASH_REMATCH[$i]}"
                 ((j++))
             fi
             ((i++))
diff --git a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh
index 37ef67bbe4f5..8b0ef8203139 100644
--- a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh
+++ b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh
@@ -307,6 +307,7 @@ spark_custom_init_scripts() {
                     "$f"
                 else
                     debug "Sourcing $f"
+                    # shellcheck disable=SC1090
                     . "$f"
                 fi
                 ;;
diff --git a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
index 432a28ee3925..cd5f51511ee8 100755
--- a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
+++ b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
@@ -52,19 +52,19 @@ case "$1" in
     set -o pipefail
 
     CMD=(
-      ${JAVA_HOME}/bin/java
+      "${JAVA_HOME}/bin/java"
       "${SPARK_EXECUTOR_JAVA_OPTS[@]}"
-      -Xms$SPARK_EXECUTOR_MEMORY
-      -Xmx$SPARK_EXECUTOR_MEMORY
+      "-Xms${SPARK_EXECUTOR_MEMORY}"
+      "-Xmx${SPARK_EXECUTOR_MEMORY}"
       -cp '/opt/bitnami/spark/conf::/opt/bitnami/spark/jars/*'
       org.apache.spark.scheduler.cluster.k8s.KubernetesExecutorBackend
-      --driver-url $SPARK_DRIVER_URL
-      --executor-id $SPARK_EXECUTOR_ID
-      --cores $SPARK_EXECUTOR_CORES
-      --app-id $SPARK_APPLICATION_ID
-      --hostname $SPARK_EXECUTOR_POD_IP
-      --resourceProfileId $SPARK_RESOURCE_PROFILE_ID
-      --podName $SPARK_EXECUTOR_POD_NAME
+      --driver-url "$SPARK_DRIVER_URL"
+      --executor-id "$SPARK_EXECUTOR_ID"
+      --cores "$SPARK_EXECUTOR_CORES"
+      --app-id "$SPARK_APPLICATION_ID"
+      --hostname "$SPARK_EXECUTOR_POD_IP"
+      --resourceProfileId "$SPARK_RESOURCE_PROFILE_ID"
+      --podName "$SPARK_EXECUTOR_POD_NAME"
     )
     ;;