Skip to content

[SPARK-57006] Use Spark 4.1.2 in docs, examples, tests, and default values #685

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-57006] Use Spark 4.1.2 in docs, examples, tests, and default values #685

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $ ./examples/submit-pi-to-prod.sh
{
"action" : "CreateSubmissionResponse",
"message" : "Driver successfully submitted as driver-20260110030233-0000",
"serverSparkVersion" : "4.1.1",
"serverSparkVersion" : "4.1.2",
"submissionId" : "driver-20260110030233-0000",
"success" : true
}
Expand All @@ -87,7 +87,7 @@ $ curl http://localhost:6066/v1/submissions/status/driver-20260110030233-0000/
{
"action" : "SubmissionStatusResponse",
"driverState" : "FINISHED",
"serverSparkVersion" : "4.1.1",
"serverSparkVersion" : "4.1.2",
"submissionId" : "driver-20260110030233-0000",
"success" : true,
"workerHostPort" : "10.1.1.172:44233",
Expand Down Expand Up @@ -124,7 +124,7 @@ Events:
Normal Scheduling 1s yunikorn default/pi-on-yunikorn-0-driver is queued and waiting for allocation
Normal Scheduled 1s yunikorn Successfully assigned default/pi-on-yunikorn-0-driver to node docker-desktop
Normal PodBindSuccessful 1s yunikorn Pod default/pi-on-yunikorn-0-driver is successfully bound to node docker-desktop
Normal Pulled 0s kubelet Container image "apache/spark:4.1.1-scala" already present on machine
Normal Pulled 0s kubelet Container image "apache/spark:4.1.2-scala" already present on machine
Normal Created 0s kubelet Created container: spark-kubernetes-driver
Normal Started 0s kubelet Started container spark-kubernetes-driver

Expand Down
4 changes: 2 additions & 2 deletions docs/spark_custom_resources.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ spec:
spark.dynamicAllocation.shuffleTracking.enabled: "true"
spark.dynamicAllocation.maxExecutors: "3"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "apache/spark:4.1.1-scala"
spark.kubernetes.container.image: "apache/spark:4.1.2-scala"
applicationTolerations:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
```

After application is submitted, Operator will add status information to your application based on
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-on-yunikorn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: cluster-on-yunikorn
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 1
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-hpa-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: cluster-with-hpa-template
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 1
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: cluster-with-hpa
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 3
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: cluster-with-template
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 1
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: cluster
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 3
Expand Down
2 changes: 1 addition & 1 deletion examples/dfs-read-write.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-java17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-on-volcano.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-on-yunikorn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-python.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
4 changes: 2 additions & 2 deletions examples/pi-with-comet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
spark.dynamicAllocation.shuffleTracking.enabled: "true"
spark.executor.extraClassPath: "local:///comet/comet.jar"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "apache/spark:4.1.1-scala"
spark.kubernetes.container.image: "apache/spark:4.1.2-scala"
spark.memory.offHeap.enabled: "true"
spark.memory.offHeap.size: "1g"
spark.plugins: "org.apache.spark.CometPlugin"
Expand Down Expand Up @@ -82,4 +82,4 @@ spec:
emptyDir:
sizeLimit: 200Mi
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-driver-timeout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ spec:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-eventlog.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ spec:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-instanceconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ spec:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-on-demand-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ spec:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-one-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ spec:
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-spark-connect-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi-with-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ spec:
priorityClassName: system-cluster-critical
terminationGracePeriodSeconds: 0
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/pi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ spec:
resourceRetainPolicy: OnFailure
ttlAfterStopMillis: 10000
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/prod-cluster-with-three-workers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: prod
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 3
Expand Down
2 changes: 1 addition & 1 deletion examples/qa-cluster-with-one-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
name: qa
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 1
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-connect-server-with-spark-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
spark.ui.reverseProxy: "true"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/spark-connect-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/spark-history-server-with-jws-filter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
spark.ui.filters: "org.apache.spark.ui.JWSFilter"
spark.org.apache.spark.ui.JWSFilter.param.secretKey: "VmlzaXQgaHR0cHM6Ly9zcGFyay5hcGFjaGUub3JnIHRvIGRvd25sb2FkIEFwYWNoZSBTcGFyay4="
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
applicationTolerations:
restartConfig:
restartPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-history-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spark.hadoop.fs.s3a.access.key: "test"
spark.hadoop.fs.s3a.secret.key: "test"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
applicationTolerations:
restartConfig:
restartPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-thrift-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
spark.kubernetes.executor.podNamePrefix: "spark-thrift-server"
spark.scheduler.mode: "FAIR"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
applicationTolerations:
restartConfig:
restartPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion examples/sql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ spec:
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/stream-word-count.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ spec:
spark.hadoop.fs.s3a.access.key: "test"
spark.hadoop.fs.s3a.secret.key: "test"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion examples/word-count.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion ...bmission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterResourceSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public SparkClusterResourceSpec(SparkCluster cluster, SparkConf conf) {
String clusterName = cluster.getMetadata().getName();
String scheduler = conf.get(Config.KUBERNETES_SCHEDULER_NAME().key(), "default-scheduler");
String namespace = conf.get(Config.KUBERNETES_NAMESPACE().key(), clusterNamespace);
String image = conf.get(Config.CONTAINER_IMAGE().key(), "apache/spark:4.1.1");
String image = conf.get(Config.CONTAINER_IMAGE().key(), "apache/spark:4.1.2");
ClusterSpec spec = cluster.getSpec();
String version = spec.getRuntimeVersions().getSparkVersion();
StringBuilder options = new StringBuilder();
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmark/sparkapps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
spark.kubernetes.driver.pod.excludedFeatureSteps: "org.apache.spark.deploy.k8s.features.KerberosConfDriverFeatureStep"
spark.kubernetes.driver.request.cores: "100m"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
---
EOF
done
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/driver-start-timeout/spark-example-driver-start-timeout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:non-existent-image"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
4 changes: 2 additions & 2 deletions tests/e2e/python/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ spec:
scenarios:
- bindings:
- name: "SPARK_VERSION"
value: "4.1.1"
value: "4.1.2"
- name: "SCALA_VERSION"
value: "2.13"
- name: "IMAGE"
value: "apache/spark:4.1.1-python3"
value: "apache/spark:4.1.2-python3"
- bindings:
- name: "SPARK_VERSION"
value: "3.5.8"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/resource-retain-duration/spark-example-retain-duration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion tests/e2e/resource-retain-on-failure/spark-example-retain-on-failure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
4 changes: 2 additions & 2 deletions tests/e2e/resource-selector/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ spec:
- name: SPARK_APPLICATION_NAME
value: "spark-example-resource-selector"
- name: SPARK_VERSION
value: "4.1.1"
value: "4.1.2"
- name: IMAGE
value: "apache/spark:4.1.1-scala"
value: "apache/spark:4.1.2-scala"
steps:
- name: install-spark-application-and-apply-label
try:
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/spark-versions/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ spec:
scenarios:
- bindings:
- name: "SPARK_VERSION"
value: "4.1.1"
value: "4.1.2"
- name: "SCALA_VERSION"
value: "2.13"
- name: "JAVA_VERSION"
value: "17"
- name: "IMAGE"
value: "apache/spark:4.1.1-scala-java17"
value: "apache/spark:4.1.2-scala-java17"
- bindings:
- name: "SPARK_VERSION"
value: "3.5.8"
Expand All @@ -41,13 +41,13 @@ spec:
value: 'apache/spark:3.5.8-scala2.12-java17-ubuntu'
- bindings:
- name: "SPARK_VERSION"
value: "4.1.1"
value: "4.1.2"
- name: "SCALA_VERSION"
value: "2.13"
- name: "JAVA_VERSION"
value: "21"
- name: "IMAGE"
value: 'apache/spark:4.1.1-scala'
value: 'apache/spark:4.1.2-scala'
steps:
- name: install-spark-application
try:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/state-transition/spark-cluster-example-succeeded.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
namespace: default
spec:
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
clusterTolerations:
instanceConfig:
initWorkers: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/state-transition/spark-example-succeeded.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
2 changes: 1 addition & 1 deletion tests/e2e/watched-namespaces/spark-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ spec:
spark.kubernetes.container.image: "apache/spark:{{SPARK_VERSION}}-scala"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: "4.1.1"
sparkVersion: "4.1.2"
Loading