Fix examples (#2010)

Signed-off-by: Peter Jablonski <[email protected]>

Author: peter-mcclonski

Makefile

@@ -48,7 +48,7 @@ helm-unittest:
 	helm unittest charts/spark-operator-chart --strict
 
 helm-lint:
-	docker run --rm --workdir /workspace --volume $(PWD):/workspace quay.io/helmpack/chart-testing:latest ct lint
+	docker run --rm --workdir /workspace --volume "$$(pwd):/workspace" quay.io/helmpack/chart-testing:latest ct lint
 
 helm-docs:
 	docker run --rm --volume "$$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:latest

charts/spark-operator-chart/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: spark-operator
 description: A Helm chart for Spark on Kubernetes operator
-version: 1.2.14
-appVersion: v1beta2-1.4.5-3.5.0
+version: 1.2.15
+appVersion: v1beta2-1.4.6-3.5.0
 keywords:
   - spark
 home: https://github.com/kubeflow/spark-operator

charts/spark-operator-chart/README.md

@@ -1,6 +1,6 @@
 # spark-operator
 
-![Version: 1.2.14](https://img.shields.io/badge/Version-1.2.14-informational?style=flat-square) ![AppVersion: v1beta2-1.4.5-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.5--3.5.0-informational?style=flat-square)
+![Version: 1.2.15](https://img.shields.io/badge/Version-1.2.15-informational?style=flat-square) ![AppVersion: v1beta2-1.4.6-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.6--3.5.0-informational?style=flat-square)
 
 A Helm chart for Spark on Kubernetes operator
 
@@ -126,7 +126,7 @@ See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall) for command docum
 | serviceAccounts.sparkoperator.create | bool | `true` | Create a service account for the operator |
 | serviceAccounts.sparkoperator.name | string | `""` | Optional name for the operator service account |
 | sidecars | list | `[]` | Sidecar containers |
-| sparkJobNamespaces | list | `[]` | List of namespaces where to run spark jobs |
+| sparkJobNamespaces | list | `[""]` | List of namespaces where to run spark jobs |
 | tolerations | list | `[]` | List of node taints to tolerate |
 | uiService.enable | bool | `true` | Enable UI service creation for Spark application |
 | volumeMounts | list | `[]` |  |

charts/spark-operator-chart/templates/spark-rbac.yaml

@@ -14,23 +14,8 @@ rules:
   - ""
   resources:
   - pods
-  verbs:
-  - "*"
-- apiGroups:
-  - ""
-  resources:
   - services
-  verbs:
-  - "*"
-- apiGroups:
-  - ""
-  resources:
   - configmaps
-  verbs:
-  - "*"
-- apiGroups:
-  - ""
-  resources:
   - persistentvolumeclaims
   verbs:
   - "*"

charts/spark-operator-chart/tests/spark-rbac_test.yaml

@@ -60,7 +60,27 @@ tests:
           kind: RoleBinding
           name: spark
 
-  - it: Should render multiple spark roles if sparkJobNamespaces is set
+  - it: Should create a single spark role with namespace "" by default
+    documentIndex: 0
+    asserts:
+      - containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          name: spark-role
+          namespace: ""
+
+  - it: Should create a single spark role binding with namespace "" by default
+    values:
+      - ../values.yaml
+    documentIndex: 1
+    asserts:
+      - containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: RoleBinding
+          name: spark
+          namespace: ""
+
+  - it: Should render multiple spark roles if sparkJobNamespaces is set with multiple values
     set:
       sparkJobNamespaces:
         - ns1
@@ -73,7 +93,7 @@ tests:
           name: spark-role
           namespace: ns1
 
-  - it: Should render multiple spark role bindings if sparkJobNamespaces is set
+  - it: Should render multiple spark role bindings if sparkJobNamespaces is set with multiple values
     set:
       sparkJobNamespaces:
         - ns1
@@ -86,7 +106,7 @@ tests:
           name: spark
           namespace: ns1
 
-  - it: Should render multiple spark roles if sparkJobNamespaces is set
+  - it: Should render multiple spark roles if sparkJobNamespaces is set with multiple values
     set:
       sparkJobNamespaces:
         - ns1
@@ -99,7 +119,7 @@ tests:
           name: spark-role
           namespace: ns2
 
-  - it: Should render multiple spark role bindings if sparkJobNamespaces is set
+  - it: Should render multiple spark role bindings if sparkJobNamespaces is set with multiple values
     set:
       sparkJobNamespaces:
         - ns1

charts/spark-operator-chart/values.yaml

@@ -53,7 +53,8 @@ serviceAccounts:
     annotations: {}
 
 # -- List of namespaces where to run spark jobs
-sparkJobNamespaces: []
+sparkJobNamespaces:
+  - ""
 # - ns1
 
 # -- Operator concurrency, higher values might increase memory usage

examples/spark-pi-configmap.yaml

@@ -21,11 +21,11 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: "gcr.io/spark-operator/spark:v3.1.1"
+  image: "spark:3.5.0"
   imagePullPolicy: Always
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.1.1.jar"
-  sparkVersion: "3.1.1"
+  mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar"
+  sparkVersion: "3.5.0"
   restartPolicy:
     type: Never
   volumes:
@@ -37,8 +37,8 @@ spec:
     coreLimit: "1200m"
     memory: "512m"
     labels:
-      version: 3.1.1
-    serviceAccount: spark
+      version: 3.5.0
+    serviceAccount: spark-operator-spark
     volumeMounts:
       - name: config-vol
         mountPath: /opt/spark/mycm
@@ -47,7 +47,7 @@ spec:
     instances: 1
     memory: "512m"
     labels:
-      version: 3.1.1
+      version: 3.5.0
     volumeMounts:
       - name: config-vol
         mountPath: /opt/spark/mycm

examples/spark-pi-custom-resource.yaml

@@ -21,11 +21,11 @@ metadata:
 spec:
   type: Scala
   mode: cluster
-  image: "gcr.io/spark-operator/spark:v3.1.1"
+  image: "spark:3.5.0"
   imagePullPolicy: Always
   mainClass: org.apache.spark.examples.SparkPi
-  mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.1.1.jar"
-  sparkVersion: "3.1.1"
+  mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar"
+  sparkVersion: "3.5.0"
   restartPolicy:
     type: Never
   volumes:
@@ -38,8 +38,8 @@ spec:
     coreLimit: "1200m"
     memory: "512m"
     labels:
-      version: 3.1.1
-    serviceAccount: spark
+      version: 3.5.0
+    serviceAccount: spark-operator-spark
     volumeMounts:
       - name: "test-volume"
         mountPath: "/tmp"
@@ -48,7 +48,7 @@ spec:
     instances: 1
     memory: "512m"
     labels:
-      version: 3.1.1
+      version: 3.5.0
     volumeMounts:
       - name: "test-volume"
         mountPath: "/tmp"

examples/spark-pi-prometheus.yaml

@@ -37,7 +37,7 @@ spec:
     memory: "512m"
     labels:
       version: 3.1.1
-    serviceAccount: spark
+    serviceAccount: spark-operator-spark
   executor:
     cores: 1
     instances: 1

examples/spark-pi-schedule.yaml

@@ -25,23 +25,23 @@ spec:
   template:
     type: Scala
     mode: cluster
-    image: "gcr.io/spark-operator/spark:v3.1.1"
+    image: "spark:3.5.0"
     imagePullPolicy: Always
     mainClass: org.apache.spark.examples.SparkPi
-    mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.1.1.jar"
-    sparkVersion: "3.1.1"
+    mainApplicationFile: "local:///opt/spark/examples/jars/spark-examples_2.12-3.5.0.jar"
+    sparkVersion: "3.5.0"
     restartPolicy:
       type: Never
     driver:
       cores: 1
       coreLimit: "1200m"
       memory: "512m"
       labels:
-        version: 3.1.1
-      serviceAccount: spark
+        version: 3.5.0
+      serviceAccount: spark-operator-spark
     executor:
       cores: 1
       instances: 1
       memory: "512m"
       labels:
-        version: 3.1.1
+        version: 3.5.0