From 8c27cca496f7e412e0a187e9968913ac082bf3f0 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 2 Dec 2019 15:56:34 +0000 Subject: [PATCH] Update loki helm chart to support service account annotations (#1341) * update loki helm chart to support service account annotations for use with EKS IAM roles Signed-off-by: Adam Johnson * Bump minor versions and fix serviceAccount reference for annotations Signed-off-by: Adam Johnson --- production/helm/loki-stack/Chart.yaml | 2 +- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/templates/serviceaccount.yaml | 2 ++ production/helm/loki/values.yaml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml index 86e18e6bfc1a1..766c841c7afb0 100644 --- a/production/helm/loki-stack/Chart.yaml +++ b/production/helm/loki-stack/Chart.yaml @@ -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." diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index f450638c0e943..6c05796ca6421 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -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." diff --git a/production/helm/loki/templates/serviceaccount.yaml b/production/helm/loki/templates/serviceaccount.yaml index a4315ced37f1d..ccbad8d926957 100644 --- a/production/helm/loki/templates/serviceaccount.yaml +++ b/production/helm/loki/templates/serviceaccount.yaml @@ -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 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 8e813592c2bdd..a740f47c2db24 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -153,6 +153,7 @@ service: serviceAccount: create: true name: + annotations: {} terminationGracePeriodSeconds: 4800