Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update loki to 3.1.1 #449

Merged
merged 49 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4e94454
fix: initial commit for loki updates
UnicornChance May 30, 2024
8ecb380
fix: lint error
UnicornChance May 30, 2024
3062604
fix: update registry1 image
UnicornChance May 30, 2024
58d559e
fix: pod anti affinity
UnicornChance May 31, 2024
967c55c
fix: remove deploymentMode value
UnicornChance May 31, 2024
0a4cc26
fix: revert removal of deploymentMode
UnicornChance May 31, 2024
a8f5b73
Merge branch 'main' into renovate-loki-update
mjnagel Jun 3, 2024
0f32824
Merge branch 'main' into renovate-loki-update
mjnagel Jun 4, 2024
1242cec
Merge branch 'main' into renovate-loki-update
mjnagel Jun 4, 2024
a24e03f
fix: pr comments
UnicornChance Jun 4, 2024
2b56f2c
fix: change to secret and fix date to resolve for now
UnicornChance Jun 4, 2024
5296644
fix: break out test apps for less ci cpu usage
UnicornChance Jun 5, 2024
b472d9b
fix: lint
UnicornChance Jun 5, 2024
01dbd1f
fix: initial commit for loki operator
UnicornChance Jun 11, 2024
276bdc4
Merge branch 'main' into renovate-loki-update
UnicornChance Jul 12, 2024
98932ba
fix: lint
UnicornChance Jul 12, 2024
00357f9
fix: duplicate prometheus
UnicornChance Jul 12, 2024
fe5d30e
fix: update to use child logger
UnicornChance Jul 12, 2024
8b65ffe
fix: lint again
UnicornChance Jul 12, 2024
bf17513
fix: authservice test app stuff
UnicornChance Jul 12, 2024
aaa36b1
Merge branch 'main' into renovate-loki-update
UnicornChance Jul 17, 2024
661ccc0
fix: app-tenant ref
UnicornChance Jul 17, 2024
99f8e23
fix: nginx image failure
UnicornChance Jul 19, 2024
c6cba18
fix: unicorn nginx
UnicornChance Jul 19, 2024
791c73c
fix: add unicorn memcached image
UnicornChance Jul 20, 2024
f9a380b
fix:lint
UnicornChance Jul 20, 2024
3bc630a
fix: lint again...
UnicornChance Jul 20, 2024
6745cc9
fix: size of memcached and memcache image
UnicornChance Jul 22, 2024
3594668
fix: disable resultsCache
UnicornChance Jul 23, 2024
a7a81a6
Merge branch 'main' into renovate-loki-update
UnicornChance Jul 23, 2024
429b2fa
Merge branch 'main' into renovate-loki-update
UnicornChance Aug 16, 2024
eb8abc0
fix: date logic, create readme
UnicornChance Aug 17, 2024
3a8a4bb
fix: lint
UnicornChance Aug 17, 2024
d55bd4d
Merge branch 'main' into renovate-loki-update
UnicornChance Aug 19, 2024
5f71934
Merge branch 'main' into renovate-loki-update
UnicornChance Aug 21, 2024
00235bc
Merge branch 'main' into renovate-loki-update
UnicornChance Sep 5, 2024
9636033
fix: ci test app deployment
UnicornChance Sep 5, 2024
861e4b5
Merge branch 'main' into renovate-loki-update
UnicornChance Sep 5, 2024
da4231f
chore: update loki (#734)
rjferguson21 Sep 9, 2024
4c6b87f
Merge branch 'main' into renovate-loki-update
rjferguson21 Sep 9, 2024
dcd46b6
remove remaining pepr changes
rjferguson21 Sep 9, 2024
7b959a3
roll back test apps changes
rjferguson21 Sep 9, 2024
93d8d8a
remove test apps
rjferguson21 Sep 9, 2024
7cbf0f3
Merge branch 'main' into renovate-loki-update
rjferguson21 Sep 10, 2024
4de1ad1
Merge remote-tracking branch 'origin/main' into renovate-loki-update
rjferguson21 Sep 10, 2024
f3db688
Merge branch 'main' into renovate-loki-update
rjferguson21 Sep 10, 2024
8d98000
fix loki metrics
rjferguson21 Sep 10, 2024
8c0b95f
remove remoteCidr for test app
rjferguson21 Sep 10, 2024
d9d9530
chore: remove broken netpol
UnicornChance Sep 11, 2024
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
2 changes: 1 addition & 1 deletion src/loki/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ components:
localPath: ../chart
- name: loki
url: https://grafana.github.io/helm-charts/
version: 5.47.1
version: 6.6.2
namespace: loki
valuesFiles:
- ../values/values.yaml
Expand Down
8 changes: 6 additions & 2 deletions src/loki/values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ loki:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/grafana/loki
tag: 2.9.6
tag: 3.0.0
podSecurityContext:
fsGroup: 10001
runAsGroup: 10001
Expand All @@ -19,4 +19,8 @@ gateway:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/nginx/nginx-alpine
tag: 1.25.3
tag: 1.26.0
memcached:
image:
repository: registry1.dso.mil/ironbank/opensource/memcached/memcached
tag: 1.6.27
10 changes: 8 additions & 2 deletions src/loki/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ loki:
image:
registry: docker.io
repository: grafana/loki
tag: 2.9.6
tag: 3.0.0

gateway:
image:
registry: docker.io
repository: nginxinc/nginx-unprivileged
tag: 1.25-alpine
tag: 1.26-alpine

memcached:
image:
registry: docker.io
repository: memcached
tag: 1.6.27-alpine
41 changes: 29 additions & 12 deletions src/loki/values/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@ loki:
insecure: false
commonConfig:
replication_factor: 1
schemaConfig:
configs:
- from: 2023-04-01
store: tsdb
object_store: "{{ .Values.loki.storage.type }}"
schema: v12
index:
prefix: loki_tsdb_
period: 24h
- from: 2024-08-01
store: tsdb
object_store: "{{ .Values.loki.storage.type }}"
schema: v13
index:
prefix: loki_tsdb_
period: 24h
extraMemberlistConfig:
rejoin_interval: 120s
# Should authentication be enabled
Expand Down Expand Up @@ -66,6 +82,8 @@ rbac:
test:
enabled: false

deploymentMode: SimpleScalable

# Configuration for the single binary node(s)
singleBinary:
# -- Number of replicas for the single binary
Expand Down Expand Up @@ -107,27 +125,26 @@ sidecar:
# -- Whether or not to create a sidecar to ingest rule from specific ConfigMaps and/or Secrets.
enabled: false

monitoring:
enabled: true
selfMonitoring:
enabled: false
grafanaAgent:
installOperator: false
lokiCanary:
enabled: false
memcachedExporter:
# -- Whether memcached metrics should be exported
enabled: false

lokiCanary:
enabled: false

gateway:
enabled: true
# Remove default anti-affinity to support single node
affinity: ""
affinity: null

read:
# Remove default anti-affinity to support single node
affinity: ""
affinity: null

write:
# Remove default anti-affinity to support single node
affinity: ""
affinity: null

backend:
# Remove default anti-affinity to support single node
affinity: ""
affinity: null
10 changes: 6 additions & 4 deletions src/loki/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ components:
valuesFiles:
- ./values/upstream-values.yaml
images:
- docker.io/grafana/loki:2.9.6
- docker.io/nginxinc/nginx-unprivileged:1.25-alpine
- docker.io/grafana/loki:3.0.0
- docker.io/nginxinc/nginx-unprivileged:1.26-alpine
- docker.io/memcached:1.6.27-alpine

- name: loki
required: true
Expand All @@ -31,5 +32,6 @@ components:
valuesFiles:
- ./values/registry1-values.yaml
images:
- registry1.dso.mil/ironbank/opensource/grafana/loki:2.9.6
- registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.25.3
- registry1.dso.mil/ironbank/opensource/grafana/loki:3.0.0
- registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.26.0
- registry1.dso.mil/ironbank/opensource/memcached/memcached:1.6.27
Loading