Skip to content

Commit

Permalink
Update loki helm chart to support service account annotations (#1341)
Browse files Browse the repository at this point in the history
* update loki helm chart to support service account annotations for use with EKS IAM roles

Signed-off-by: Adam Johnson <a.johnson@winton.com>

* Bump minor versions and fix serviceAccount reference for annotations

Signed-off-by: Adam Johnson <a.johnson@winton.com>
  • Loading branch information
adamjohnson01 authored and cyriltovena committed Dec 2, 2019
1 parent 15bfc89 commit 8c27cca
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion production/helm/loki-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki-stack
version: 0.20.0
version: 0.21.0
appVersion: v1.0.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki
version: 0.18.0
version: 0.19.0
appVersion: v1.0.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 2 additions & 0 deletions production/helm/loki/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ metadata:
chart: {{ template "loki.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
annotations:
{{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
name: {{ template "loki.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ service:
serviceAccount:
create: true
name:
annotations: {}

terminationGracePeriodSeconds: 4800

Expand Down

0 comments on commit 8c27cca

Please sign in to comment.