fix: fixed serviceaccount annotations (#1972)

* fixed serviceaccount annotations Signed-off-by: Andrew Chubatiuk <[email protected]> * bump chart version Signed-off-by: Andrew Chubatiuk <[email protected]> * docs fix Signed-off-by: Andrew Chubatiuk <[email protected]> --------- Signed-off-by: Andrew Chubatiuk <[email protected]>
kubeflow · Apr 16, 2024 · 1d3e385 · 1d3e385
1 parent e9dbdfb
commit 1d3e385
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: spark-operator
 description: A Helm chart for Spark on Kubernetes operator
-version: 1.2.7
+version: 1.2.8
 appVersion: v1beta2-1.4.3-3.5.0
 keywords:
   - spark

diff --git a/charts/spark-operator-chart/README.md b/charts/spark-operator-chart/README.md
@@ -1,6 +1,6 @@
 # spark-operator
 
-![Version: 1.2.7](https://img.shields.io/badge/Version-1.2.7-informational?style=flat-square) ![AppVersion: v1beta2-1.4.3-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.3--3.5.0-informational?style=flat-square)
+![Version: 1.2.8](https://img.shields.io/badge/Version-1.2.8-informational?style=flat-square) ![AppVersion: v1beta2-1.4.3-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.3--3.5.0-informational?style=flat-square)
 
 A Helm chart for Spark on Kubernetes operator
 

diff --git a/charts/spark-operator-chart/templates/deployment.yaml b/charts/spark-operator-chart/templates/deployment.yaml
@@ -54,15 +54,15 @@ spec:
           {{- toYaml .Values.securityContext | nindent 10 }}
         {{- if or .Values.metrics.enable .Values.webhook.enable }}
         ports:
-          {{ if .Values.metrics.enable }}
+          {{ if .Values.metrics.enable -}}
           - name: {{ .Values.metrics.portName | quote }}
             containerPort: {{ .Values.metrics.port }}
-          {{ end }}
-          {{ if .Values.webhook.enable }}
+          {{- end }}
+          {{ if .Values.webhook.enable -}}
           - name: {{ .Values.webhook.portName | quote }}
             containerPort: {{ .Values.webhook.port }}
-          {{ end }}
-        {{ end }}
+          {{- end }}
+        {{ end -}}
         args:
         - -v={{ .Values.logLevel }}
         - -logtostderr

diff --git a/charts/spark-operator-chart/templates/spark-serviceaccount.yaml b/charts/spark-operator-chart/templates/spark-serviceaccount.yaml
@@ -1,16 +1,14 @@
-{{- if .Values.serviceAccounts.spark.create -}}
+{{- if .Values.serviceAccounts.spark.create }}
 {{- range $sparkJobNamespace := .Values.sparkJobNamespaces | default (list .Release.Namespace) }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "spark.serviceAccountName" $ }}
   namespace: {{ $sparkJobNamespace }}
-  labels:
-    {{- include "spark-operator.labels" $ | nindent 4 }}
   {{- with $.Values.serviceAccounts.spark.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
+  labels: {{ include "spark-operator.labels" $ | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/spark-operator-chart/tests/deployment_test.yaml b/charts/spark-operator-chart/tests/deployment_test.yaml
@@ -7,6 +7,15 @@ release:
   name: spark-operator
 
 tests:
+  - it: Should contain namespace arg when sparkJobNamespaces is equal to 1
+    set:
+      sparkJobNamespaces:
+        - ns1
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: -namespace=ns1
+
   - it: Should add pod annotations if podAnnotations is set
     set:
       podAnnotations:

diff --git a/charts/spark-operator-chart/values.yaml b/charts/spark-operator-chart/values.yaml
@@ -54,6 +54,7 @@ serviceAccounts:
 
 # -- List of namespaces where to run spark jobs, operator namespace is included only when list of namespaces is empty
 sparkJobNamespaces: []
+# - ns1
 
 # -- Operator concurrency, higher values might increase memory usage
 controllerThreads: 10