Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang

## Unreleased

- [BUGFIX] add temporary storage volume and mount for sidecar rule [#19973](https://github.com/grafana/loki/pull/19973)
- [BUGFIX] Don't mark loki.storage.bucketNames.chunks as required, if an s3 url is provided. [#19873](https://github.com/grafana/loki/pull/19873)
- [BUGFIX] Do not mark loki.storage.bucketNames.chunks as required, if minio is used. [#19871](https://github.com/grafana/loki/pull/19871)
- [ENHANCEMENT] Use fsGroupChangePolicy=OnRootMismatch on loki to speed up pod starts [#13942](https://github.com/grafana/loki/pull/13942)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ spec:
volumeMounts:
- name: sc-rules-volume
mountPath: {{ .Values.sidecar.rules.folder | quote }}
- name: sc-tmp
mountPath: /tmp
{{- end}}
{{- with .Values.backend.extraContainers }}
{{- toYaml . | nindent 8}}
Expand Down Expand Up @@ -245,10 +247,14 @@ spec:
volumes:
- name: tmp
emptyDir: {}
{{- if .Values.sidecar.rules.enabled }}
- name: sc-tmp
emptyDir: {}
{{- end }}
{{- if not .Values.backend.persistence.volumeClaimsEnabled }}
- name: data
{{- toYaml .Values.backend.persistence.dataVolumeParameters | nindent 10 }}
{{- end}}
{{- end }}
- name: config
{{- include "loki.configVolume" . | nindent 10 }}
- name: runtime-config
Expand Down
6 changes: 6 additions & 0 deletions production/helm/loki/templates/ruler/statefulset-ruler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ spec:
volumeMounts:
- name: sc-rules-volume
mountPath: {{ .Values.sidecar.rules.folder | quote }}
- name: sc-tmp
mountPath: /tmp/
{{- end}}
{{- with .Values.ruler.extraContainers }}
{{- toYaml . | nindent 8}}
Expand Down Expand Up @@ -243,6 +245,10 @@ spec:
{{- end }}
- name: tmp
emptyDir: {}
{{- if .Values.sidecar.rules.enabled }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this not be behind {{- if and .Values.sidecar.rules.enabled .Values.ruler.sidecar }}? Otherwise LGTM

- name: sc-tmp
emptyDir: {}
{{- end }}
{{- with (concat .Values.global.extraVolumes .Values.ruler.extraVolumes) | uniq }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ spec:
volumeMounts:
- name: sc-rules-volume
mountPath: {{ .Values.sidecar.rules.folder | quote }}
- name: sc-tmp
mountPath: /tmp
{{- end}}
{{- with .Values.singleBinary.extraContainers }}
{{- toYaml . | nindent 8 }}
Expand All @@ -251,6 +253,10 @@ spec:
volumes:
- name: tmp
emptyDir: {}
{{- if .Values.sidecar.rules.enabled }}
- name: sc-tmp
emptyDir: {}
{{- end }}
- name: config
{{- include "loki.configVolume" . | nindent 10 }}
- name: runtime-config
Expand Down
Loading