Upgrade to Spark 3.2.0

image.yaml

@@ -12,7 +12,7 @@ labels:
     - name: maintainer
       value: Trevor McKay <[email protected]>
     - name: sparkversion
-      value: 3.0.1
+      value: 3.2.0
     - name: "io.openshift.s2i.scripts-url"
       value: "image:///usr/libexec/s2i"
 
@@ -29,7 +29,6 @@ modules:
         - name: common
         - name: metrics
         - name: spark
-        - name: s2i
 run:
     user: 185
     entrypoint:

modules/spark/module.yaml

@@ -12,7 +12,7 @@ packages:
     install:
         - wget
 artifacts:
-    - url: https://archive.apache.org/dist/spark/spark-3.0.1/spark-3.0.1-bin-hadoop3.2.tgz
-      md5: 31e019e35e75a4c55c7efa4464641bf1
+    - url: https://archive.apache.org/dist/spark/spark-3.2.0/spark-3.2.0-bin-hadoop3.2.tgz
+      md5: 2f28abfe7b8838f01b010fc22ccad155
 execute:
     - script: install

openshift-spark-build/Dockerfile

@@ -1,26 +1,12 @@
-# Copyright 2019 Red Hat
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ------------------------------------------------------------------------
-#
+
 # This is a Dockerfile for the radanalyticsio/openshift-spark:3.0 image.
 
 
 ## START target image radanalyticsio/openshift-spark:3.0
 ## \
     FROM centos:8
 
+
     USER root
 
 ###### START module 'common:1.0'
@@ -53,9 +39,9 @@
 
 ###### START module 'spark:1.0'
 ###### \
-        # Copy 'spark' module general artifacts
+        # Copy 'spark' module general artifacts to '/tmp/artifacts/' destination
         COPY \
-            spark-3.0.1-bin-hadoop3.2.tgz \
+            spark-3.2.0-bin-hadoop3.2.tgz \
             /tmp/artifacts/
         # Copy 'spark' module content
         COPY modules/spark /tmp/scripts/spark
@@ -75,55 +61,28 @@
 ###### /
 ###### END module 'spark:1.0'
 
-###### START module 's2i:1.0'
-###### \
-        # Copy 's2i' module content
-        COPY modules/s2i /tmp/scripts/s2i
-        # Switch to 'root' user to install 's2i' module defined packages
-        USER root
-        # Install packages defined in the 's2i' module
-        RUN yum --setopt=tsflags=nodocs install -y wget \
-            && rpm -q wget
-        # Set 's2i' module defined environment variables
-        ENV \
-            PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark/bin" \
-            SPARK_HOME="/opt/spark" \
-            SPARK_INSTALL="/opt/spark-distro" \
-            STI_SCRIPTS_PATH="/usr/libexec/s2i" 
-        # Custom scripts from 's2i' module
-        USER root
-        RUN [ "sh", "-x", "/tmp/scripts/s2i/install" ]
-###### /
-###### END module 's2i:1.0'
-
 ###### START image 'radanalyticsio/openshift-spark:3.0'
 ###### \
         # Switch to 'root' user to install 'radanalyticsio/openshift-spark' image defined packages
         USER root
         # Install packages defined in the 'radanalyticsio/openshift-spark' image
         RUN yum --setopt=tsflags=nodocs install -y java-11-openjdk python3-numpy \
             && rpm -q java-11-openjdk python3-numpy
-        # Set 'radanalyticsio/openshift-spark' image defined environment variables
-        ENV \
-            JBOSS_IMAGE_NAME="radanalyticsio/openshift-spark" \
-            JBOSS_IMAGE_VERSION="3.0" 
         # Set 'radanalyticsio/openshift-spark' image defined labels
         LABEL \
-            io.cekit.version="3.6.0"  \
+            io.cekit.version="3.12.0"  \
             io.openshift.s2i.scripts-url="image:///usr/libexec/s2i"  \
             maintainer="Trevor McKay <[email protected]>"  \
-            name="radanalyticsio/openshift-spark"  \
-            sparkversion="3.0.1"  \
-            version="3.0" 
+            sparkversion="3.2.0" 
 ###### /
 ###### END image 'radanalyticsio/openshift-spark:3.0'
 
 
+
     # Switch to 'root' user and remove artifacts and modules
     USER root
     RUN [ ! -d /tmp/scripts ] || rm -rf /tmp/scripts
     RUN [ ! -d /tmp/artifacts ] || rm -rf /tmp/artifacts
-
     # Clear package manager metadata
     RUN yum clean all && [ ! -d /var/cache/yum ] || rm -rf /var/cache/yum