Skip to content

Commit

Permalink
Upgrade to Spark 3.5.2 (kubeflow#2154)
Browse files Browse the repository at this point in the history
Signed-off-by: Jacob Salway <[email protected]>
  • Loading branch information
jacobsalway authored Sep 9, 2024
1 parent 10fcb8e commit e1b7a27
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.1 AS builder

Expand Down
10 changes: 5 additions & 5 deletions config/samples/v1beta1_sparkapplication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ 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
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.0
version: 3.5.2
instances: 1
10 changes: 5 additions & 5 deletions config/samples/v1beta2_scheduledsparkapplication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,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
Expand Down
10 changes: 5 additions & 5 deletions config/samples/v1beta2_sparkapplication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ 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
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.0
version: 3.5.2
instances: 1
10 changes: 5 additions & 5 deletions examples/spark-pi-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -34,7 +34,7 @@ spec:
name: test-configmap
driver:
labels:
version: 3.5.0
version: 3.5.2
cores: 1
coreLimit: 1200m
memory: 512m
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-custom-resource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -35,7 +35,7 @@ spec:
type: Directory
driver:
labels:
version: 3.5.0
version: 3.5.2
cores: 1
coreLimit: 1200m
memory: 512m
Expand All @@ -45,7 +45,7 @@ spec:
mountPath: /tmp
executor:
labels:
version: 3.5.0
version: 3.5.2
instances: 1
cores: 1
memory: 512m
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-dynamic-allocation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-kube-scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/spark-pi-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-scheduled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-volcano.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi-yunikorn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/spark-pi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1b7a27

Please sign in to comment.