Upgrade to Spark 3.5.3

Signed-off-by: Jacob Salway <jacob.salway@gmail.com>
kubeflow · Oct 12, 2024 · 6b95587 · 6b95587
1 parent 56b4974
commit 6b95587
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ARG SPARK_IMAGE=spark:3.5.2
+ARG SPARK_IMAGE=spark:3.5.3
 
 FROM golang:1.23.1 AS builder
 

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ The following table lists the most recent few versions of the operator.
 
 | Operator Version | API Version | Kubernetes Version | Base Spark Version |
 | ------------- | ------------- | ------------- | ------------- |
-| `v2.0.x` | `v1beta2` | 1.16+ | `3.5.2` |
+| `v2.0.x` | `v1beta2` | 1.16+ | `3.5.3` |
 | `v1beta2-1.6.x-3.5.0` | `v1beta2` | 1.16+ | `3.5.0` |
 | `v1beta2-1.5.x-3.5.0` | `v1beta2` | 1.16+ | `3.5.0` |
 | `v1beta2-1.4.x-3.5.0` | `v1beta2` | 1.16+ | `3.5.0` |

diff --git a/config/samples/v1beta1_sparkapplication.yaml b/config/samples/v1beta1_sparkapplication.yaml
@@ -8,10 +8,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     labels:

diff --git a/config/samples/v1beta2_scheduledsparkapplication.yaml b/config/samples/v1beta2_scheduledsparkapplication.yaml
@@ -11,10 +11,10 @@ spec:
   template:
     type: Scala
     mode: cluster
-    image: spark:3.5.2
+    image: spark:3.5.3
     imagePullPolicy: IfNotPresent
     mainClass: org.apache.spark.examples.SparkPi
-    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
     sparkVersion: 3.5.2
     restartPolicy:
       type: Never

diff --git a/config/samples/v1beta2_sparkapplication.yaml b/config/samples/v1beta2_sparkapplication.yaml
@@ -8,10 +8,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     labels:

diff --git a/examples/spark-pi-configmap.yaml b/examples/spark-pi-configmap.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   restartPolicy:
     type: Never

diff --git a/examples/spark-pi-custom-resource.yaml b/examples/spark-pi-custom-resource.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   restartPolicy:
     type: Never

diff --git a/examples/spark-pi-dynamic-allocation.yaml b/examples/spark-pi-dynamic-allocation.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     cores: 1

diff --git a/examples/spark-pi-kube-scheduler.yaml b/examples/spark-pi-kube-scheduler.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     cores: 1

diff --git a/examples/spark-pi-prometheus.yaml b/examples/spark-pi-prometheus.yaml
@@ -22,10 +22,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: {IMAGE_REGISTRY}/{IMAGE_REPOSITORY}/spark:3.5.2-gcs-prometheus
+  image: {IMAGE_REGISTRY}/{IMAGE_REPOSITORY}/spark:3.5.3-gcs-prometheus
   imagePullPolicy: Always
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   arguments:
   - "100000"
   sparkVersion: 3.5.2

diff --git a/examples/spark-pi-python.yaml b/examples/spark-pi-python.yaml
@@ -22,7 +22,7 @@ spec:
   type: Python
   pythonVersion: "3"
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainApplicationFile: local:///opt/spark/examples/src/main/python/pi.py
   sparkVersion: 3.5.2

diff --git a/examples/spark-pi-scheduled.yaml b/examples/spark-pi-scheduled.yaml
@@ -25,10 +25,10 @@ spec:
   template:
     type: Scala
     mode: cluster
-    image: spark:3.5.2
+    image: spark:3.5.3
     imagePullPolicy: IfNotPresent
     mainClass: org.apache.spark.examples.SparkPi
-    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+    mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
     sparkVersion: 3.5.2
     restartPolicy:
       type: Never

diff --git a/examples/spark-pi-ttl.yaml b/examples/spark-pi-ttl.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   timeToLiveSeconds: 30
   driver:

diff --git a/examples/spark-pi-volcano.yaml b/examples/spark-pi-volcano.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     cores: 1

diff --git a/examples/spark-pi-yunikorn.yaml b/examples/spark-pi-yunikorn.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   sparkVersion: 3.5.2
   driver:
     cores: 1
@@ -36,4 +36,4 @@ spec:
     memory: 512m
   batchScheduler: yunikorn
   batchSchedulerOptions:
-    queue: root.default
+    queue: root.default
diff --git a/examples/spark-pi.yaml b/examples/spark-pi.yaml
@@ -21,10 +21,10 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: spark:3.5.2
+  image: spark:3.5.3
   imagePullPolicy: IfNotPresent
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.5.2.jar
+  mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
   arguments:
   - "5000"
   sparkVersion: 3.5.2

diff --git a/spark-docker/Dockerfile b/spark-docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ARG SPARK_IMAGE=spark:3.5.2
+ARG SPARK_IMAGE=spark:3.5.3
 FROM ${SPARK_IMAGE}
 
 # Switch to user root so we can add additional jars and configuration files.