Merge pull request #53 from DataDog/vboulineau/operator-fixed-sa

Fix name of serviceAccount used in Deployment if serviceAccount.name is set
DataDog · Sep 28, 2020 · b58be64 · b58be64
2 parents a5c6e4c + 3e3c4b3
commit b58be64
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.2
+
+* Fix name of serviceAccount used in Deployment if serviceAccount.name is set
+
 ## 0.1.1
 
 * Add automatic README.md generation from `Values.yaml`

diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.3.1
 description: Datadog Operator
 keywords:

diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md
@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 ## Values
 
@@ -22,6 +22,6 @@
 | resources | object | `{}` | Set resources requests/limits for Datadog Operator PODs |
 | secretBackend.command | string | `""` | Specifies the path to the command that implements the secret backend api |
 | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
-| serviceAccount.name | string | `nil` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| serviceAccount.name | string | `nil` | The name of the service account to use. If not set name is generated using the fullname template |
 | supportExtendedDaemonset | string | `"false"` | If true, supports using ExtendedDeamonSet CRD |
 | tolerations | list | `[]` | Allows to schedule Datadog Operator on tainted nodes |
diff --git a/charts/datadog-operator/templates/_helpers.tpl b/charts/datadog-operator/templates/_helpers.tpl
@@ -48,9 +48,5 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Create the name of the service account to use
 */}}
 {{- define "datadog-operator.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "datadog-operator.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
+{{ default (include "datadog-operator.fullname" .) .Values.serviceAccount.name }}
 {{- end -}}
diff --git a/charts/datadog-operator/templates/deployment.yaml b/charts/datadog-operator/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-      serviceAccountName: {{ include "datadog-operator.fullname" . }}
+      serviceAccountName: {{ include "datadog-operator.serviceAccountName" . }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml
@@ -34,8 +34,7 @@ rbac:
 serviceAccount:
   # serviceAccount.create -- Specifies whether a service account should be created
   create: true
-  # serviceAccount.name -- The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
+  # serviceAccount.name -- The name of the service account to use. If not set name is generated using the fullname template
   name:
 # resources -- Set resources requests/limits for Datadog Operator PODs
 resources: {}