Skip to content

[SPARK-49706] Use apache/spark images instead of spark #128

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-49706] Use apache/spark images instead of spark #128

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Events:
Normal Scheduled 14s yunikorn Successfully assigned default/pi-on-yunikorn-0-driver to node docker-desktop
Normal PodBindSuccessful 14s yunikorn Pod default/pi-on-yunikorn-0-driver is successfully bound to node docker-desktop
Normal TaskCompleted 6s yunikorn Task default/pi-on-yunikorn-0-driver is completed
Normal Pulled 13s kubelet Container image "spark:4.0.0-preview1" already present on machine
Normal Pulled 13s kubelet Container image "apache/spark:4.0.0-preview1" already present on machine
Normal Created 13s kubelet Created container spark-kubernetes-driver
Normal Started 13s kubelet Started container spark-kubernetes-driver

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 @@ -25,7 +25,7 @@ spec:
minWorkers: 1
maxWorkers: 1
sparkConf:
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.kubernetes.scheduler.name: "yunikorn"
spark.master.ui.title: "Spark Cluster on YuniKorn Scheduler"
spark.master.rest.enabled: "true"
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 @@ -87,7 +87,7 @@ spec:
annotations:
customAnnotation: "annotation"
sparkConf:
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.master.ui.title: "Spark Cluster with Template"
spark.master.rest.enabled: "true"
spark.master.rest.host: "0.0.0.0"
Expand Down
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 @@ -26,7 +26,7 @@ spec:
spark.dynamicAllocation.maxExecutors: "3"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.kubernetes.scheduler.name: "yunikorn"
spark.kubernetes.driver.label.queue: "root.default"
spark.kubernetes.executor.label.queue: "root.default"
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-scala.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spark.dynamicAllocation.maxExecutors: "3"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1-scala"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1-scala"
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
Expand Down
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 @@ -25,6 +25,6 @@ spec:
spark.kubernetes.driver.limit.cores: "5"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
runtimeVersions:
sparkVersion: "4.0.0-preview1"
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 @@ -25,7 +25,7 @@ spec:
spark.dynamicAllocation.maxExecutors: "3"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
Expand Down
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 @@ -25,7 +25,7 @@ spec:
minWorkers: 3
maxWorkers: 3
sparkConf:
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.master.ui.title: "Prod Spark Cluster"
spark.master.rest.enabled: "true"
spark.master.rest.host: "0.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/pyspark-pi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
spark.dynamicAllocation.maxExecutors: "3"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
applicationTolerations:
resourceRetainPolicy: OnFailure
runtimeVersions:
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 @@ -25,7 +25,7 @@ spec:
minWorkers: 1
maxWorkers: 1
sparkConf:
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.master.ui.title: "QA Spark Cluster"
spark.master.rest.enabled: "true"
spark.master.rest.host: "0.0.0.0"
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 @@ -26,6 +26,6 @@ spec:
spark.dynamicAllocation.maxExecutors: "3"
spark.log.structuredLogging.enabled: "false"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
runtimeVersions:
sparkVersion: "4.0.0-preview1"
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 @@ -27,7 +27,7 @@ spec:
- name: "SCALA_VERSION"
value: "2.12"
- name: "IMAGE"
value: 'spark:3.5.2-scala2.12-java17-python3-ubuntu'
value: "apache/spark:3.5.2-scala2.12-java17-python3-ubuntu"
steps:
- name: install-spark-application
try:
Expand Down Expand Up @@ -66,4 +66,4 @@ spec:
namespace: default
- podLogs:
selector: spark-app-name=spark
namespace: default
namespace: default
2 changes: 1 addition & 1 deletion tests/e2e/spark-versions/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
- name: "JAVA_VERSION"
value: "17"
- name: "IMAGE"
value: 'spark:4.0.0-preview1-scala2.13-java17-ubuntu'
value: "apache/spark:4.0.0-preview1-scala2.13-java17-ubuntu"
- bindings:
- name: "SPARK_VERSION"
value: "3.5.2"
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 @@ -26,7 +26,7 @@ spec:
minWorkers: 1
maxWorkers: 1
sparkConf:
spark.kubernetes.container.image: "spark:4.0.0-preview1"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1"
spark.master.ui.title: "Spark Cluster E2E Test"
spark.master.rest.enabled: "true"
spark.master.rest.host: "0.0.0.0"
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 @@ -25,7 +25,7 @@ spec:
jars: "local:///opt/spark/examples/jars/spark-examples_2.13-4.0.0-preview1.jar"
sparkConf:
spark.executor.instances: "1"
spark.kubernetes.container.image: "spark:4.0.0-preview1-scala2.13-java17-ubuntu"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1-scala2.13-java17-ubuntu"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
runtimeVersions:
sparkVersion: 4.0.0-preview1
Expand Down
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 @@ -25,7 +25,7 @@ spec:
jars: "local:///opt/spark/examples/jars/spark-examples_2.13-4.0.0-preview1.jar"
sparkConf:
spark.executor.instances: "1"
spark.kubernetes.container.image: "spark:4.0.0-preview1-scala2.13-java17-ubuntu"
spark.kubernetes.container.image: "apache/spark:4.0.0-preview1-scala2.13-java17-ubuntu"
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
spark.kubernetes.driver.request.cores: "0.5"
spark.kubernetes.executor.request.cores: "0.5"
Expand Down