Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build-tools/helm/spark-kubernetes-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ cluster using the [Helm](https://helm.sh) package manager. With this, you can la

- Support Apache Spark 3.5+
- Support `SparkApp` and `SparkCluster` CRDs
- `sparkapplications.spark.apache.org` (v1alpha1)
- `sparkclusters.spark.apache.org` (v1alpha1)
- `sparkapplications.spark.apache.org` (v1beta1)
- `sparkclusters.spark.apache.org` (v1beta1)
- Support HPA for SparkCluster
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ metadata:
{{- end }}
{{- if $workloadResources.sparkApplicationSentinel.create }}
{{- range $sentinelNs := .Values.workloadResources.sparkApplicationSentinel.sentinelNamespaces.data }}
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: {{ $workloadResources.sparkApplicationSentinel.name }}
Expand Down
2 changes: 1 addition & 1 deletion docs/operations.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ send the HTTP Get to the liveness endpoint, and the
kubelet will then kill the spark operator container and restart it.

```yaml
apiVersion: org.apache.spark/v1alpha1
apiVersion: org.apache.spark/v1beta1
kind: SparkApplication
metadata:
name: spark-sentinel-resources
Expand Down
2 changes: 1 addition & 1 deletion docs/spark_custom_resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SparkApplication can be defined in YAML format. User may configure the applicati
and configurations. Let's start with the [Spark-Pi example](../examples/pi.yaml):

```yaml
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-java21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: cluster-java21
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-on-yunikorn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: cluster-on-yunikorn
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-hpa-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: cluster-with-hpa-template
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: cluster-with-hpa
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-with-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: cluster-with-template
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-java21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-java21
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-on-yunikorn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-on-yunikorn
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-scala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-scala
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-with-one-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-with-one-pod
Expand Down
2 changes: 1 addition & 1 deletion examples/pi-with-spark-connect-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-with-spark-connect-plugin
Expand Down
2 changes: 1 addition & 1 deletion examples/pi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi
Expand Down
2 changes: 1 addition & 1 deletion examples/prod-cluster-with-three-workers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: prod
Expand Down
2 changes: 1 addition & 1 deletion examples/pyspark-pi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: pi-python
Expand Down
2 changes: 1 addition & 1 deletion examples/qa-cluster-with-one-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: qa
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-connect-server-with-spark-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: spark-connect-server
Expand Down
2 changes: 1 addition & 1 deletion examples/spark-connect-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: spark-connect-server
Expand Down
2 changes: 1 addition & 1 deletion examples/sql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: sql
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@SuppressWarnings("PMD.DataClass")
public class Constants {
public static final String API_GROUP = "spark.apache.org";
public static final String API_VERSION = "v1alpha1";
public static final String API_VERSION = "v1beta1";
public static final String LABEL_SPARK_APPLICATION_NAME = "spark.operator/spark-app-name";
public static final String LABEL_SPARK_CLUSTER_NAME = "spark.operator/spark-cluster-name";
public static final String LABEL_SPARK_OPERATOR_NAME = "spark.operator/name";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: spark-job-succeeded-test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: spark-cluster-succeeded-test
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/python/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
- events:
namespace: default
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: default
- describe:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/python/pyspark-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: ($SPARK_APPLICATION_NAME)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/spark-versions/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ spec:
- events:
namespace: default
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: default
- describe:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/spark-versions/spark-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: ($SPARK_APPLICATION_NAME)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/state-transition/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
file: "../assertions/spark-application/spark-state-transition.yaml"
catch:
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: default
finally:
Expand All @@ -72,7 +72,7 @@ spec:
file: "../assertions/spark-cluster/spark-cluster-state-transition.yaml"
catch:
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
namespace: default
finally:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkCluster
metadata:
name: spark-cluster-succeeded-test
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/state-transition/spark-example-succeeded.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: spark-job-succeeded-test
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/watched-namespaces/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ spec:
namespace: default
selector: app.kubernetes.io/component=operator-deployment,app.kubernetes.io/name=spark-kubernetes-operator
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: spark-1
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: spark-2
finally:
Expand Down Expand Up @@ -103,7 +103,7 @@ spec:
namespace: default-2
selector: app.kubernetes.io/component=operator-deployment,app.kubernetes.io/name=spark-kubernetes-operator
- describe:
apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
namespace: spark-3
- get:
Expand All @@ -119,4 +119,4 @@ spec:
kubectl delete sparkapplication spark-job-succeeded-test -n spark-3 --ignore-not-found=true
helm uninstall spark-kubernetes-operator -n default-2
kubectl delete namespace default-2 --ignore-not-found=true
kubectl delete namespace spark-3 --ignore-not-found=true
kubectl delete namespace spark-3 --ignore-not-found=true
2 changes: 1 addition & 1 deletion tests/e2e/watched-namespaces/spark-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

apiVersion: spark.apache.org/v1alpha1
apiVersion: spark.apache.org/v1beta1
kind: SparkApplication
metadata:
name: spark-job-succeeded-test
Expand Down
Loading