Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Fix serviceAccount for APM server
Browse files Browse the repository at this point in the history
Why
----
- In the current Helm chart for `apm-server`, serviceAccount for the
Deployment is only set when `serviceAccount` is set in `values.yaml`.
However, it is wrong. `serviceAccount` should always be set because even
when no `serviceAccount` is set in `values.yaml`, a managed one is still
created.

What
----
- Always set `serviceAccount` for apm-server Deployment to the template
apm.serviceAccount defined in `_helpers.tpl`
  • Loading branch information
Dat Tang committed Aug 17, 2020
1 parent c5660f4 commit 2d81d1a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions apm-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
{{- if .Values.serviceAccount }}
serviceAccountName: {{ .Values.serviceAccount }}
{{- end }}
serviceAccountName: {{ template "apm.serviceAccount" . }}
volumes:
{{- range .Values.secretMounts }}
- name: {{ .name }}
Expand Down

0 comments on commit 2d81d1a

Please sign in to comment.