Skip to content

Commit

Permalink
Merge branch 'main' into sso-client-templating
Browse files Browse the repository at this point in the history
  • Loading branch information
TristanHoladay authored Mar 22, 2024
2 parents 93f162d + 03ca499 commit 8ecdfbf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
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.43.3
version: 5.47.1
namespace: loki
valuesFiles:
- ../values/values.yaml
Expand Down
2 changes: 1 addition & 1 deletion 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.4
tag: 2.9.6
podSecurityContext:
fsGroup: 10001
runAsGroup: 10001
Expand Down
2 changes: 1 addition & 1 deletion src/loki/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ loki:
image:
registry: docker.io
repository: grafana/loki
tag: 2.9.4
tag: 2.9.6

gateway:
image:
Expand Down
4 changes: 2 additions & 2 deletions src/loki/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ components:
valuesFiles:
- ./values/upstream-values.yaml
images:
- docker.io/grafana/loki:2.9.4
- docker.io/grafana/loki:2.9.6
- docker.io/nginxinc/nginx-unprivileged:1.25-alpine

- name: loki
Expand All @@ -31,5 +31,5 @@ components:
valuesFiles:
- ./values/registry1-values.yaml
images:
- registry1.dso.mil/ironbank/opensource/grafana/loki:2.9.4
- registry1.dso.mil/ironbank/opensource/grafana/loki:2.9.6
- registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.25.3

0 comments on commit 8ecdfbf

Please sign in to comment.