diff --git a/charts/loki/Chart.yaml b/charts/loki/Chart.yaml index ac9e2fdbc1..fc750c9894 100644 --- a/charts/loki/Chart.yaml +++ b/charts/loki/Chart.yaml @@ -4,7 +4,7 @@ description: Helm chart for Grafana Loki supporting monolithic, simple scalable, type: application # renovate: docker=docker.io/grafana/loki appVersion: 3.7.1 -version: 11.4.10 +version: 11.4.11 kubeVersion: ">=1.25.0-0" home: https://grafana-community.github.io/helm-charts sources: diff --git a/charts/loki/templates/_serviceaccount.yaml b/charts/loki/templates/_serviceaccount.yaml index 14c0a0c916..fc2dbaff6c 100644 --- a/charts/loki/templates/_serviceaccount.yaml +++ b/charts/loki/templates/_serviceaccount.yaml @@ -9,7 +9,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ $name | default (include "loki.resourceName" (dict "ctx" $ctx "component" $target)) }} + name: {{ $name | default (include "loki.serviceAccountName" (dict "ctx" $ctx "component" $component "target" $target)) }} namespace: {{ include "loki.namespace" $ctx }} labels: {{- include "loki.labels" . | nindent 4 }} diff --git a/charts/loki/tests/backend/serviceaccount_test.yaml b/charts/loki/tests/backend/serviceaccount_test.yaml index a6782c2a90..972201064b 100644 --- a/charts/loki/tests/backend/serviceaccount_test.yaml +++ b/charts/loki/tests/backend/serviceaccount_test.yaml @@ -61,6 +61,24 @@ tests: path: subjects[0].name value: backend-custom-sa + - it: creates backend ServiceAccount with backend serviceAccount.name override + set: + backend.serviceAccount.create: true + backend.serviceAccount.name: backend-custom-sa + asserts: + - template: backend/statefulset.yaml + equal: + path: spec.template.spec.serviceAccountName + value: backend-custom-sa + - template: backend/clusterrolebinding.yaml + equal: + path: subjects[0].name + value: backend-custom-sa + - template: backend/serviceaccount.yaml + equal: + path: metadata.name + value: backend-custom-sa + - it: sets backend ServiceAccount automountServiceAccountToken when creating backend account set: backend.serviceAccount.create: true diff --git a/charts/loki/tests/single-binary/serviceaccount_test.yaml b/charts/loki/tests/single-binary/serviceaccount_test.yaml index 82dfbcfd64..690f3822ff 100644 --- a/charts/loki/tests/single-binary/serviceaccount_test.yaml +++ b/charts/loki/tests/single-binary/serviceaccount_test.yaml @@ -36,7 +36,7 @@ tests: - template: serviceaccount.yaml equal: path: metadata.name - value: RELEASE-NAME-loki + value: global-custom-sa - it: uses explicit global service account name without creating serviceaccount when disabled set: