Upgrade to Spark 3.5.2

jacobsalway · jacobsalway · commit 60dc8b6ecefe · 2024-09-09T13:18:42.000+10:00
Signed-off-by: Jacob Salway &lt;jacob.salway@gmail.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ARG SPARK_IMAGE=spark:3.5.0
+ARG SPARK_IMAGE=spark:3.5.2
 
 FROM golang:1.22.5 AS builder
 
diff --git a/examples/spark-pi-configmap.yaml b/examples/spark-pi-configmap.yaml
@@ -21,11 +21,11 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   restartPolicy:
     type: Never
   volumes:
@@ -34,7 +34,7 @@ spec:
       name: test-configmap
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
@@ -44,7 +44,7 @@ spec:
       mountPath: /opt/spark/config
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 1
     cores: 1
     memory: 512m
diff --git a/examples/spark-pi-custom-resource.yaml b/examples/spark-pi-custom-resource.yaml
@@ -21,11 +21,11 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   restartPolicy:
     type: Never
   volumes:
@@ -35,7 +35,7 @@ spec:
       type: Directory
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
@@ -45,7 +45,7 @@ spec:
       mountPath: /tmp
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 1
     cores: 1
     memory: 512m
diff --git a/examples/spark-pi-dynamic-allocation.yaml b/examples/spark-pi-dynamic-allocation.yaml
@@ -21,23 +21,23 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   arguments:
   - "50000"
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 1
     cores: 1
     coreLimit: 1200m
diff --git a/examples/spark-pi-kube-scheduler.yaml b/examples/spark-pi-kube-scheduler.yaml
@@ -21,21 +21,21 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 2
     cores: 1
     coreLimit: 1200m
diff --git a/examples/spark-pi-python.yaml b/examples/spark-pi-python.yaml
@@ -22,20 +22,20 @@ spec:
   type: Python
   pythonVersion: "3"
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainApplicationFile: local:///opt/spark/examples/src/main/python/pi.py
-  sparkVersion: 3.5.0
+  sparkVersion: 3.5.2
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 1
     cores: 1
     coreLimit: 1200m
diff --git a/examples/spark-pi-scheduled.yaml b/examples/spark-pi-scheduled.yaml
@@ -25,23 +25,23 @@ spec:
   template:
     type: Scala
     mode: cluster
-    image: spark:3.5.0
+    image: spark:3.5.2
     imagePullPolicy: IfNotPresent
     mainClass: org.apache.spark.examples.SparkPi
-    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-    sparkVersion: 3.5.0
+    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+    sparkVersion: 3.5.2
     restartPolicy:
       type: Never
     driver:
       labels:
-        version: 3.5.0
+        version: 3.5.2
       cores: 1
       coreLimit: 1200m
       memory: 512m
       serviceAccount: spark-operator-spark
     executor:
       labels:
-        version: 3.5.0
+        version: 3.5.2
       instances: 1
       cores: 1
       coreLimit: 1200m
diff --git a/examples/spark-pi-volcano.yaml b/examples/spark-pi-volcano.yaml
@@ -21,21 +21,21 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 2
     cores: 1
     coreLimit: 1200m
diff --git a/examples/spark-pi-yunikorn.yaml b/examples/spark-pi-yunikorn.yaml
@@ -21,21 +21,21 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 2
     cores: 1
     coreLimit: 1200m
diff --git a/examples/spark-pi.yaml b/examples/spark-pi.yaml
@@ -21,21 +21,21 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.0
+  image: spark:3.5.2
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar
-  sparkVersion: 3.5.0
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  sparkVersion: 3.5.2
   driver:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     cores: 1
     coreLimit: 1200m
     memory: 512m
     serviceAccount: spark-operator-spark
   executor:
     labels:
-      version: 3.5.0
+      version: 3.5.2
     instances: 1
     cores: 1
     coreLimit: 1200m

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-ARG SPARK_IMAGE=spark:3.5.0`
	`17`	`+ARG SPARK_IMAGE=spark:3.5.2`
`18`	`18`
`19`	`19`	`FROM golang:1.22.5 AS builder`
`20`	`20`