Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Spark 3.5.4 #2379

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −46
Draft

Upgrade to Spark 3.5.4 #2379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# limitations under the License.
#

ARG SPARK_IMAGE=spark:3.5.3
ARG SPARK_IMAGE=spark:3.5.4

FROM golang:1.23.1 AS builder

1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -77,6 +77,7 @@ The following table lists the most recent few versions of the operator.

| Operator Version | API Version | Kubernetes Version | Base Spark Version |
|-----------------------|-------------|--------------------|--------------------|
| `v2.1.0` | `v1beta2` | 1.16+ | `3.5.3` |
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can add another row for 3.5.4 later depending on whether this ends up in a minor or patch release.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about bumping the Spark version to v3.5.4 when we are going to release the next minor version i.e. v2.2.0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I'll put this back into draft and mark it as frozen so we can take it up in the next minor release.

| `v2.0.x` | `v1beta2` | 1.16+ | `3.5.2` |
| `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` |
8 changes: 4 additions & 4 deletions config/samples/v1beta1_sparkapplication.yaml
View file
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
labels:
version: 3.5.3
version: 3.5.4
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.3
version: 3.5.4
instances: 1
8 changes: 4 additions & 4 deletions config/samples/v1beta2_scheduledsparkapplication.yaml
View file
Original file line number Diff line number Diff line change
@@ -11,23 +11,23 @@ spec:
template:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
restartPolicy:
type: Never
driver:
labels:
version: 3.5.3
version: 3.5.4
cores: 1
coreLimit: 1200m
memory: 512m
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.3
version: 3.5.4
instances: 1
cores: 1
coreLimit: 1200m
8 changes: 4 additions & 4 deletions config/samples/v1beta2_sparkapplication.yaml
View file
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
labels:
version: 3.5.3
version: 3.5.4
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.3
version: 3.5.4
instances: 1
4 changes: 2 additions & 2 deletions examples/spark-pi-configmap.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
restartPolicy:
type: Never
volumes:
4 changes: 2 additions & 2 deletions examples/spark-pi-custom-resource.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
restartPolicy:
type: Never
driver:
4 changes: 2 additions & 2 deletions examples/spark-pi-dynamic-allocation.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
cores: 1
memory: 512m
4 changes: 2 additions & 2 deletions examples/spark-pi-kube-scheduler.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
cores: 1
memory: 512m
12 changes: 6 additions & 6 deletions examples/spark-pi-pod-template.yaml
View file
Original file line number Diff line number Diff line change
@@ -57,8 +57,8 @@ metadata:
spec:
type: Scala
mode: cluster
sparkVersion: 3.5.3
image: spark:3.5.3
sparkVersion: 3.5.4
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
mainClass: org.apache.spark.examples.SparkPi
@@ -68,9 +68,9 @@ spec:
template:
metadata:
labels:
spark.apache.org/version: 3.5.3
spark.apache.org/version: 3.5.4
annotations:
spark.apache.org/version: 3.5.3
spark.apache.org/version: 3.5.4
spec:
containers:
- name: spark-kubernetes-driver
@@ -133,9 +133,9 @@ spec:
template:
metadata:
labels:
spark.apache.org/version: 3.5.3
spark.apache.org/version: 3.5.4
annotations:
spark.apache.org/version: 3.5.3
spark.apache.org/version: 3.5.4
spec:
containers:
- name: spark-kubernetes-executor
8 changes: 4 additions & 4 deletions examples/spark-pi-prometheus.yaml
View file
Original file line number Diff line number Diff line change
@@ -22,27 +22,27 @@ metadata:
spec:
type: Scala
mode: cluster
image: {IMAGE_REGISTRY}/{IMAGE_REPOSITORY}/spark:3.5.3-gcs-prometheus
image: {IMAGE_REGISTRY}/{IMAGE_REPOSITORY}/spark:3.5.4-gcs-prometheus
imagePullPolicy: Always
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
arguments:
- "100000"
sparkVersion: 3.5.3
sparkVersion: 3.5.4
restartPolicy:
type: Never
driver:
cores: 1
memory: 512m
labels:
version: 3.5.3
version: 3.5.4
serviceAccount: spark-operator-spark
executor:
cores: 1
instances: 1
memory: 512m
labels:
version: 3.5.3
version: 3.5.4
monitoring:
exposeDriverMetrics: true
exposeExecutorMetrics: true
4 changes: 2 additions & 2 deletions examples/spark-pi-python.yaml
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ spec:
type: Python
pythonVersion: "3"
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainApplicationFile: local:///opt/spark/examples/src/main/python/pi.py
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
cores: 1
memory: 512m
4 changes: 2 additions & 2 deletions examples/spark-pi-scheduled.yaml
View file
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@ spec:
template:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
restartPolicy:
type: Never
driver:
4 changes: 2 additions & 2 deletions examples/spark-pi-ttl.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
timeToLiveSeconds: 30
driver:
cores: 1
4 changes: 2 additions & 2 deletions examples/spark-pi-volcano.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
cores: 1
memory: 512m
4 changes: 2 additions & 2 deletions examples/spark-pi-yunikorn.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
cores: 1
memory: 512m
8 changes: 4 additions & 4 deletions examples/spark-pi.yaml
View file
Original file line number Diff line number Diff line change
@@ -21,22 +21,22 @@ metadata:
spec:
type: Scala
mode: cluster
image: spark:3.5.3
image: spark:3.5.4
imagePullPolicy: IfNotPresent
mainClass: org.apache.spark.examples.SparkPi
mainApplicationFile: local:///opt/spark/examples/jars/spark-examples.jar
arguments:
- "5000"
sparkVersion: 3.5.3
sparkVersion: 3.5.4
driver:
labels:
version: 3.5.3
version: 3.5.4
cores: 1
memory: 512m
serviceAccount: spark-operator-spark
executor:
labels:
version: 3.5.3
version: 3.5.4
instances: 1
cores: 1
memory: 512m
2 changes: 1 addition & 1 deletion spark-docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# limitations under the License.
#

ARG SPARK_IMAGE=spark:3.5.3
ARG SPARK_IMAGE=spark:3.5.4
FROM ${SPARK_IMAGE}

# Switch to user root so we can add additional jars and configuration files.