diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index bf24f6f5ab058..ca634389f392b 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -12294,7 +12294,7 @@ false string Docker image tag
-"1.30.10"
+"2.1.2"
 
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 16066af359e23..78ce12f97e302 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang ## Unreleased +- [FEATURE] Bump sidecar to 2.1.2, and add the now mandatory /tmp volumeMount. [#19759](https://github.com/grafana/loki/pull/19759) ## 6.46.0 diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index c59d80c5e7911..e09c4c8487f32 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -218,7 +218,9 @@ spec: volumeMounts: - name: sc-rules-volume mountPath: {{ .Values.sidecar.rules.folder | quote }} - {{- end}} + - name: sc-rules-tmp + mountPath: /tmp + {{- end }} {{- with .Values.backend.extraContainers }} {{- toYaml . | nindent 8}} {{- end }} @@ -270,7 +272,9 @@ spec: sizeLimit: {{ .Values.sidecar.rules.sizeLimit }} {{- else }} emptyDir: {} - {{- end -}} + {{- end }} + - name: sc-rules-tmp + emptyDir: {} {{- end -}} {{- with (concat .Values.global.extraVolumes .Values.backend.extraVolumes) | uniq }} {{- toYaml . | nindent 8 }} diff --git a/production/helm/loki/templates/ruler/statefulset-ruler.yaml b/production/helm/loki/templates/ruler/statefulset-ruler.yaml index 61994f1bfefd5..d2e508dc8f99f 100644 --- a/production/helm/loki/templates/ruler/statefulset-ruler.yaml +++ b/production/helm/loki/templates/ruler/statefulset-ruler.yaml @@ -192,7 +192,9 @@ spec: volumeMounts: - name: sc-rules-volume mountPath: {{ .Values.sidecar.rules.folder | quote }} - {{- end}} + - name: sc-rules-tmp + mountPath: /tmp + {{- end }} {{- with .Values.ruler.extraContainers }} {{- toYaml . | nindent 8}} {{- end }} @@ -234,7 +236,9 @@ spec: sizeLimit: {{ .Values.sidecar.rules.sizeLimit }} {{- else }} emptyDir: {} - {{- end -}} + {{- end }} + - name: sc-rules-tmp + emptyDir: {} {{- end -}} {{- range $dir, $_ := .Values.ruler.directories }} - name: {{ include "loki.rulerRulesDirName" $dir }} diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index 3fb56e1a1910f..7c8b969c65bac 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -228,7 +228,9 @@ spec: volumeMounts: - name: sc-rules-volume mountPath: {{ .Values.sidecar.rules.folder | quote }} - {{- end}} + - name: sc-rules-tmp + mountPath: /tmp + {{- end }} {{- with .Values.singleBinary.extraContainers }} {{- toYaml . | nindent 8 }} {{- end }} @@ -272,7 +274,9 @@ spec: sizeLimit: {{ .Values.sidecar.rules.sizeLimit }} {{- else }} emptyDir: {} - {{- end -}} + {{- end }} + - name: sc-rules-tmp + emptyDir: {} {{- end -}} {{- with .Values.singleBinary.extraVolumes }} {{- toYaml . | nindent 8 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 99a8846940be0..732f2d86becf2 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -4000,7 +4000,7 @@ sidecar: # -- The Docker registry and image for the k8s sidecar repository: docker.io/kiwigrid/k8s-sidecar # -- Docker image tag - tag: 1.30.10 + tag: 2.1.2 # -- Docker image sha. If empty, no sha will be used sha: "" # -- Docker image pull policy