Skip to content

Commit 5bae013

Browse files
DebakelOrakelDebakel Orakel
andauthored
Update Loki Helm chart to grafana-community.github.io / v13.5.0 (#13)
* Update Loki Helm chart to grafana-community.github.io / v13.5.0 As of March 16, 2026, the Grafana Loki Helm chart for OSS users has moved to grafana-community/helm-charts (forked at chart version 6.55.0). OSS users are encouraged to migrate to the community-maintained chart. Removes additional env-vars as it is covered by the Helm chart. Updates images replacement. * Update Helm chart to v13.7.2 --------- Co-authored-by: Debakel Orakel <do@tegridy.io>
1 parent 9133576 commit 5bae013

139 files changed

Lines changed: 3246 additions & 1466 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

class/defaults.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ parameters:
1212

1313
charts:
1414
loki:
15-
source: https://grafana.github.io/helm-charts
16-
version: v6.53.0
15+
source: https://grafana-community.github.io/helm-charts
16+
version: v13.7.2
1717

1818
images:
1919
loki:
@@ -28,6 +28,9 @@ parameters:
2828
nginx:
2929
registry: docker.io
3030
repository: nginxinc/nginx-unprivileged
31+
accessLogExporter:
32+
registry: ghcr.io
33+
repository: jkroepke/access-log-exporter
3134

3235
preset: legacy
3336

component/helm_values.jsonnet

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ local openshift = if isOpenshift then com.makeMergeable({
9090
}) else {};
9191

9292
local images = com.makeMergeable({
93-
image: {
94-
repository: '%(registry)s/%(repository)s' % params.images.loki,
95-
[if std.objectHas(params.images.loki, 'tag') then 'tag']: params.images.loki.tag,
93+
loki: {
94+
image: {
95+
repository: '%(registry)s/%(repository)s' % params.images.loki,
96+
[if std.objectHas(params.images.loki, 'tag') then 'tag']: params.images.loki.tag,
97+
},
9698
},
9799
memcached: {
98100
image: {
@@ -114,13 +116,19 @@ local images = com.makeMergeable({
114116
[if std.objectHas(params.images.nginx, 'tag') then 'tag']: params.images.nginx.tag,
115117
},
116118
},
119+
metrics: {
120+
image: {
121+
registry: params.images.accessLogExporter.registry,
122+
repository: params.images.accessLogExporter.repository,
123+
[if std.objectHas(params.images.accessLogExporter, 'tag') then 'tag']: params.images.accessLogExporter.tag,
124+
},
125+
},
117126
},
118127
});
119128

120129
local global = com.makeMergeable({
121130
global: {
122131
extraEnvFrom: [ { secretRef: { name: '%s-bucket-secret' % inv.parameters._instance } } ],
123-
extraArgs: [ '-config.expand-env=true' ],
124132
podAnnotations: {
125133
bucketSecretVersion: '%s' % params.s3.auth.secretVersion,
126134
},

tests/extra-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ parameters:
2525
registry: dockerhub.vshn.net
2626
nginx:
2727
registry: dockerhub.vshn.net
28+
accessLogExporter:
29+
tag: latest
2830

2931
components:
3032
ruler:

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
labels:
55
app.kubernetes.io/instance: loki
66
app.kubernetes.io/name: loki
7-
app.kubernetes.io/version: 3.6.5
8-
helm.sh/chart: loki-6.53.0
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
99
name: loki-clusterrole
1010
rules:
1111
- apiGroups:

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
labels:
55
app.kubernetes.io/instance: loki
66
app.kubernetes.io/name: loki
7-
app.kubernetes.io/version: 3.6.5
8-
helm.sh/chart: loki-6.53.0
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
99
name: loki-clusterrolebinding
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/poddisruptionbudget-backend.yaml renamed to tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/pdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
app.kubernetes.io/component: backend
66
app.kubernetes.io/instance: loki
77
app.kubernetes.io/name: loki
8-
app.kubernetes.io/version: 3.6.5
9-
helm.sh/chart: loki-6.53.0
8+
app.kubernetes.io/version: 3.7.2
9+
helm.sh/chart: loki-13.7.2
1010
name: loki-backend
1111
namespace: syn-loki
1212
spec:

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/service-backend-headless.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/service-backend.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations: null
5+
labels:
6+
app.kubernetes.io/component: backend
7+
app.kubernetes.io/instance: loki
8+
app.kubernetes.io/name: loki
9+
app.kubernetes.io/version: 3.7.2
10+
helm.sh/chart: loki-13.7.2
11+
name: loki-backend
12+
namespace: syn-loki
13+
spec:
14+
ports:
15+
- name: http-metrics
16+
port: 3100
17+
protocol: TCP
18+
targetPort: http-metrics
19+
- name: grpc
20+
port: 9095
21+
protocol: TCP
22+
targetPort: grpc
23+
- name: grpclb
24+
port: 9096
25+
protocol: TCP
26+
targetPort: grpc
27+
publishNotReadyAddresses: true
28+
selector:
29+
app.kubernetes.io/component: backend
30+
app.kubernetes.io/instance: loki
31+
app.kubernetes.io/name: loki
32+
type: ClusterIP
33+
---
34+
apiVersion: v1
35+
kind: Service
36+
metadata:
37+
annotations: null
38+
labels:
39+
app.kubernetes.io/component: backend
40+
app.kubernetes.io/instance: loki
41+
app.kubernetes.io/name: loki
42+
app.kubernetes.io/version: 3.7.2
43+
helm.sh/chart: loki-13.7.2
44+
prometheus.io/service-monitor: 'false'
45+
variant: headless
46+
name: loki-backend-headless
47+
namespace: syn-loki
48+
spec:
49+
clusterIP: None
50+
ports:
51+
- name: http-metrics
52+
port: 3100
53+
protocol: TCP
54+
targetPort: http-metrics
55+
- name: grpc
56+
port: 9095
57+
protocol: TCP
58+
targetPort: grpc
59+
- name: grpclb
60+
port: 9096
61+
protocol: TCP
62+
targetPort: grpc
63+
publishNotReadyAddresses: true
64+
selector:
65+
app.kubernetes.io/component: backend
66+
app.kubernetes.io/instance: loki
67+
app.kubernetes.io/name: loki
68+
type: ClusterIP

tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/statefulset-backend.yaml renamed to tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/statefulset.yaml

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ metadata:
66
app.kubernetes.io/instance: loki
77
app.kubernetes.io/name: loki
88
app.kubernetes.io/part-of: memberlist
9-
app.kubernetes.io/version: 3.6.5
10-
helm.sh/chart: loki-6.53.0
9+
app.kubernetes.io/version: 3.7.2
10+
helm.sh/chart: loki-13.7.2
1111
name: loki-backend
1212
namespace: syn-loki
1313
spec:
@@ -26,15 +26,15 @@ spec:
2626
template:
2727
metadata:
2828
annotations:
29-
checksum/config: 97913dbb9b85bb7a6df56d0176b64e94b3c339ab1700f212b9d56139f92b3d90
30-
kubectl.kubernetes.io/default-container: loki
29+
checksum/config: 253c4147cd4e25cd49d9777c4546b92ddd55ae4feed09b4dbe135d92e484f7a6
30+
kubectl.kubernetes.io/default-container: backend
3131
labels:
3232
app.kubernetes.io/component: backend
3333
app.kubernetes.io/instance: loki
3434
app.kubernetes.io/name: loki
3535
app.kubernetes.io/part-of: memberlist
36-
app.kubernetes.io/version: 3.6.5
37-
helm.sh/chart: loki-6.53.0
36+
app.kubernetes.io/version: 3.7.2
37+
helm.sh/chart: loki-13.7.2
3838
spec:
3939
affinity:
4040
podAntiAffinity:
@@ -49,15 +49,32 @@ spec:
4949
containers:
5050
- args:
5151
- -config.file=/etc/loki/config/config.yaml
52+
- -config.expand-env=true
5253
- -target=backend
5354
- -legacy-read-mode=false
54-
- -config.expand-env=true
55+
env:
56+
- name: GOMEMLIMIT
57+
value: 1740MiB
58+
- name: GOGC
59+
value: '80'
60+
- name: HASH_RING_INSTANCE_ADDR
61+
valueFrom:
62+
fieldRef:
63+
fieldPath: status.podIP
5564
envFrom:
5665
- secretRef:
5766
name: loki-bucket-secret
58-
image: docker.io/grafana/loki:3.6.5
67+
image: docker.io/grafana/loki:3.7.2
5968
imagePullPolicy: IfNotPresent
60-
name: loki
69+
livenessProbe:
70+
failureThreshold: 10
71+
httpGet:
72+
path: /loki/api/v1/status/buildinfo
73+
port: http-metrics
74+
periodSeconds: 30
75+
successThreshold: 1
76+
timeoutSeconds: 1
77+
name: backend
6178
ports:
6279
- containerPort: 3100
6380
name: http-metrics
@@ -90,15 +107,17 @@ spec:
90107
drop:
91108
- ALL
92109
readOnlyRootFilesystem: true
110+
seccompProfile:
111+
type: RuntimeDefault
93112
volumeMounts:
94113
- mountPath: /etc/loki/config
95114
name: config
96115
- mountPath: /etc/loki/runtime-config
97116
name: runtime-config
98-
- mountPath: /tmp
99-
name: tmp
100117
- mountPath: /var/loki
101118
name: data
119+
- mountPath: /tmp
120+
name: temp
102121
- mountPath: /rules
103122
name: sc-rules-volume
104123
- env:
@@ -116,26 +135,57 @@ spec:
116135
value: '60'
117136
- name: LOG_LEVEL
118137
value: INFO
119-
image: docker.io/kiwigrid/k8s-sidecar:1.30.9
138+
- name: HEALTH_PORT
139+
value: '8080'
140+
image: docker.io/kiwigrid/k8s-sidecar:2.7.3
120141
imagePullPolicy: IfNotPresent
142+
livenessProbe:
143+
failureThreshold: 3
144+
httpGet:
145+
path: /healthz
146+
port: http-sidecar
147+
initialDelaySeconds: 30
148+
periodSeconds: 30
149+
successThreshold: 1
150+
timeoutSeconds: 1
121151
name: loki-sc-rules
152+
ports:
153+
- containerPort: 8080
154+
name: http-sidecar
155+
protocol: TCP
156+
readinessProbe:
157+
failureThreshold: 3
158+
httpGet:
159+
path: /healthz
160+
port: http-sidecar
161+
initialDelaySeconds: 3
162+
periodSeconds: 10
163+
successThreshold: 1
164+
timeoutSeconds: 1
122165
securityContext:
123166
allowPrivilegeEscalation: false
124167
capabilities:
125168
drop:
126169
- ALL
127170
readOnlyRootFilesystem: true
171+
seccompProfile:
172+
type: RuntimeDefault
128173
volumeMounts:
174+
- mountPath: /tmp
175+
name: sc-rules-temp
129176
- mountPath: /rules
130177
name: sc-rules-volume
178+
enableServiceLinks: true
131179
securityContext:
132180
fsGroupChangePolicy: OnRootMismatch
133181
runAsNonRoot: true
182+
seccompProfile:
183+
type: RuntimeDefault
134184
serviceAccountName: loki
135185
terminationGracePeriodSeconds: 300
136186
volumes:
137187
- emptyDir: {}
138-
name: tmp
188+
name: temp
139189
- configMap:
140190
items:
141191
- key: config.yaml
@@ -147,6 +197,8 @@ spec:
147197
name: runtime-config
148198
- emptyDir: {}
149199
name: sc-rules-volume
200+
- emptyDir: {}
201+
name: sc-rules-temp
150202
updateStrategy:
151203
rollingUpdate:
152204
partition: 0

0 commit comments

Comments
 (0)