diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index a2f8abbbc945b..21c1b00ac58a0 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -2039,7 +2039,7 @@ null
chunksCache.persistence.storageSize |
string |
- Size of persistent disk |
+ Size of persistent disk, must be in G or Gi |
"10G"
@@ -6545,7 +6545,12 @@ false
| object |
The SecurityContext override for memcached pods |
-{}
+{
+ "fsGroup": 11211,
+ "runAsGroup": 11211,
+ "runAsNonRoot": true,
+ "runAsUser": 11211
+}
|
@@ -9584,7 +9589,7 @@ null
resultsCache.persistence.storageSize |
string |
- Size of persistent disk |
+ Size of persistent disk, must be in G or Gi |
"10G"
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 3525bc396547b..f41649010447e 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang
[//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
+## 6.14.1
+
+- [BUGFIX] Fixed Memcached persistence options.
+
## 6.14.0
- [FEATURE] Add additional service annotations for components in distributed mode
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index b05f8ff0fdd04..24e94eb8bc508 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.1.1
-version: 6.14.0
+version: 6.14.1
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md
index f55b4186debf4..dea0ec488b023 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
# loki
-![Version: 6.14.0](https://img.shields.io/badge/Version-6.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
+![Version: 6.14.1](https://img.shields.io/badge/Version-6.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
diff --git a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
index ce490ee6cd713..0664ba43c6a2b 100644
--- a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
+++ b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
@@ -102,9 +102,11 @@ spec:
ports:
- containerPort: {{ .port }}
name: client
+ {{- /* Calculate storage size as round(.persistence.storageSize * 0.9). But with integer built-in operators. */}}
+ {{- $persistenceSize := (div (mul (trimSuffix "Gi" .persistence.storageSize | trimSuffix "G") 9) 10 ) }}
args:
- -m {{ .allocatedMemory }}
- - --extended=modern,track_sizes{{ if .persistence.enabled }},ext_path={{ .persistence.mountPath }}/file:{{ .persistence.storageSize }}{{ end }}{{ with .extraExtendedOptions }},{{ . }}{{ end }}
+ - --extended=modern,track_sizes{{ if .persistence.enabled }},ext_path={{ .persistence.mountPath }}/file:{{ $persistenceSize }}G,ext_wbuf_size=16{{ end }}{{ with .extraExtendedOptions }},{{ . }}{{ end }}
- -I {{ .maxItemMemory }}m
- -c {{ .connectionLimit }}
- -v
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 6c72cc6b38914..fe7b9273ee80a 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -2962,7 +2962,11 @@ memcached:
# -- Memcached Docker image pull policy
pullPolicy: IfNotPresent
# -- The SecurityContext override for memcached pods
- podSecurityContext: {}
+ podSecurityContext:
+ runAsNonRoot: true
+ runAsUser: 11211
+ runAsGroup: 11211
+ fsGroup: 11211
# -- The name of the PriorityClass for memcached pods
priorityClassName: null
# -- The SecurityContext for memcached containers
@@ -3085,7 +3089,7 @@ resultsCache:
persistence:
# -- Enable creating PVCs for the results-cache
enabled: false
- # -- Size of persistent disk
+ # -- Size of persistent disk, must be in G or Gi
storageSize: 10G
# -- Storage class to be used.
# If defined, storageClassName: .
@@ -3187,7 +3191,7 @@ chunksCache:
persistence:
# -- Enable creating PVCs for the chunks-cache
enabled: false
- # -- Size of persistent disk
+ # -- Size of persistent disk, must be in G or Gi
storageSize: 10G
# -- Storage class to be used.
# If defined, storageClassName: .
|