Skip to content

Commit 5e02dff

Browse files
committed
feat(helm): Bump sidecar to latest version and /tmp volumeMount
Signed-off-by: Mathieu Parent <[email protected]>
1 parent f609e27 commit 5e02dff

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

docs/sources/setup/install/helm/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12294,7 +12294,7 @@ false
1229412294
<td>string</td>
1229512295
<td>Docker image tag</td>
1229612296
<td><pre lang="json">
12297-
"1.30.10"
12297+
"2.1.2"
1229812298
</pre>
1229912299
</td>
1230012300
</tr>

production/helm/loki/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
## Unreleased
1515

16+
- [FEATURE] Bump sidecar to 2.1.2, and add the now mandatory /tmp volumeMount. [#19759](https://github.com/grafana/loki/pull/19759)
1617

1718
## 6.46.0
1819

production/helm/loki/templates/backend/statefulset-backend.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ spec:
218218
volumeMounts:
219219
- name: sc-rules-volume
220220
mountPath: {{ .Values.sidecar.rules.folder | quote }}
221-
{{- end}}
221+
- name: sc-rules-tmp
222+
mountPath: /tmp
223+
{{- end }}
222224
{{- with .Values.backend.extraContainers }}
223225
{{- toYaml . | nindent 8}}
224226
{{- end }}
@@ -270,7 +272,9 @@ spec:
270272
sizeLimit: {{ .Values.sidecar.rules.sizeLimit }}
271273
{{- else }}
272274
emptyDir: {}
273-
{{- end -}}
275+
{{- end }}
276+
- name: sc-rules-tmp
277+
emptyDir: {}
274278
{{- end -}}
275279
{{- with (concat .Values.global.extraVolumes .Values.backend.extraVolumes) | uniq }}
276280
{{- toYaml . | nindent 8 }}

production/helm/loki/templates/ruler/statefulset-ruler.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ spec:
192192
volumeMounts:
193193
- name: sc-rules-volume
194194
mountPath: {{ .Values.sidecar.rules.folder | quote }}
195-
{{- end}}
195+
- name: sc-rules-tmp
196+
mountPath: /tmp
197+
{{- end }}
196198
{{- with .Values.ruler.extraContainers }}
197199
{{- toYaml . | nindent 8}}
198200
{{- end }}
@@ -234,7 +236,9 @@ spec:
234236
sizeLimit: {{ .Values.sidecar.rules.sizeLimit }}
235237
{{- else }}
236238
emptyDir: {}
237-
{{- end -}}
239+
{{- end }}
240+
- name: sc-rules-tmp
241+
emptyDir: {}
238242
{{- end -}}
239243
{{- range $dir, $_ := .Values.ruler.directories }}
240244
- name: {{ include "loki.rulerRulesDirName" $dir }}

production/helm/loki/templates/single-binary/statefulset.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ spec:
228228
volumeMounts:
229229
- name: sc-rules-volume
230230
mountPath: {{ .Values.sidecar.rules.folder | quote }}
231-
{{- end}}
231+
- name: sc-rules-tmp
232+
mountPath: /tmp
233+
{{- end }}
232234
{{- with .Values.singleBinary.extraContainers }}
233235
{{- toYaml . | nindent 8 }}
234236
{{- end }}
@@ -272,7 +274,9 @@ spec:
272274
sizeLimit: {{ .Values.sidecar.rules.sizeLimit }}
273275
{{- else }}
274276
emptyDir: {}
275-
{{- end -}}
277+
{{- end }}
278+
- name: sc-rules-tmp
279+
emptyDir: {}
276280
{{- end -}}
277281
{{- with .Values.singleBinary.extraVolumes }}
278282
{{- toYaml . | nindent 8 }}

production/helm/loki/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4000,7 +4000,7 @@ sidecar:
40004000
# -- The Docker registry and image for the k8s sidecar
40014001
repository: docker.io/kiwigrid/k8s-sidecar
40024002
# -- Docker image tag
4003-
tag: 1.30.10
4003+
tag: 2.1.2
40044004
# -- Docker image sha. If empty, no sha will be used
40054005
sha: ""
40064006
# -- Docker image pull policy

0 commit comments

Comments
 (0)