diff --git a/Dockerfile b/Dockerfile index 9cdff65cab..5cd34b6c55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/config/samples/v1beta1_sparkapplication.yaml b/config/samples/v1beta1_sparkapplication.yaml index d6c3e25b47..a9b084bbd2 100644 --- a/config/samples/v1beta1_sparkapplication.yaml +++ b/config/samples/v1beta1_sparkapplication.yaml @@ -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 diff --git a/config/samples/v1beta2_scheduledsparkapplication.yaml b/config/samples/v1beta2_scheduledsparkapplication.yaml index 294430f576..e6850801c3 100644 --- a/config/samples/v1beta2_scheduledsparkapplication.yaml +++ b/config/samples/v1beta2_scheduledsparkapplication.yaml @@ -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 diff --git a/config/samples/v1beta2_sparkapplication.yaml b/config/samples/v1beta2_sparkapplication.yaml index 70f4152b99..f534a07e78 100644 --- a/config/samples/v1beta2_sparkapplication.yaml +++ b/config/samples/v1beta2_sparkapplication.yaml @@ -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 diff --git a/examples/spark-pi-configmap.yaml b/examples/spark-pi-configmap.yaml index e2b4bc556f..06f844ddbd 100644 --- a/examples/spark-pi-configmap.yaml +++ b/examples/spark-pi-configmap.yaml @@ -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: @@ -34,7 +34,7 @@ spec: name: test-configmap driver: labels: - version: 3.5.0 + version: 3.5.2 cores: 1 coreLimit: 1200m memory: 512m @@ -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 diff --git a/examples/spark-pi-custom-resource.yaml b/examples/spark-pi-custom-resource.yaml index 83df405e10..862148db10 100644 --- a/examples/spark-pi-custom-resource.yaml +++ b/examples/spark-pi-custom-resource.yaml @@ -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: @@ -35,7 +35,7 @@ spec: type: Directory driver: labels: - version: 3.5.0 + version: 3.5.2 cores: 1 coreLimit: 1200m memory: 512m @@ -45,7 +45,7 @@ spec: mountPath: /tmp executor: labels: - version: 3.5.0 + version: 3.5.2 instances: 1 cores: 1 memory: 512m diff --git a/examples/spark-pi-dynamic-allocation.yaml b/examples/spark-pi-dynamic-allocation.yaml index 800313914f..8f98e7220a 100644 --- a/examples/spark-pi-dynamic-allocation.yaml +++ b/examples/spark-pi-dynamic-allocation.yaml @@ -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 diff --git a/examples/spark-pi-kube-scheduler.yaml b/examples/spark-pi-kube-scheduler.yaml index 010154fe2a..4fe7bf573a 100644 --- a/examples/spark-pi-kube-scheduler.yaml +++ b/examples/spark-pi-kube-scheduler.yaml @@ -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 diff --git a/examples/spark-pi-python.yaml b/examples/spark-pi-python.yaml index 5d0a7f2736..bc8c474010 100644 --- a/examples/spark-pi-python.yaml +++ b/examples/spark-pi-python.yaml @@ -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 diff --git a/examples/spark-pi-scheduled.yaml b/examples/spark-pi-scheduled.yaml index f74143e7c1..442124049e 100644 --- a/examples/spark-pi-scheduled.yaml +++ b/examples/spark-pi-scheduled.yaml @@ -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 diff --git a/examples/spark-pi-volcano.yaml b/examples/spark-pi-volcano.yaml index 277ed173d2..871d82d934 100644 --- a/examples/spark-pi-volcano.yaml +++ b/examples/spark-pi-volcano.yaml @@ -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 diff --git a/examples/spark-pi-yunikorn.yaml b/examples/spark-pi-yunikorn.yaml index 43ed1cfded..7f3f7d4dc5 100644 --- a/examples/spark-pi-yunikorn.yaml +++ b/examples/spark-pi-yunikorn.yaml @@ -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 diff --git a/examples/spark-pi.yaml b/examples/spark-pi.yaml index 6d7ae68690..4c0c15b624 100644 --- a/examples/spark-pi.yaml +++ b/examples/spark-pi.yaml @@ -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