Skip to content

Commit

Permalink
fix(helm): only default bucket names when using minio (#12548)
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney authored Apr 9, 2024
1 parent c914272 commit 2e32ec5
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 20 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ production/helm/loki/src/helm-test/helm-test:
helm-lint: ## run helm linter
$(MAKE) -BC production/helm/loki lint

helm-docs:
helm-docs -c production/helm/loki -g production/helm/loki

#################
# Loki-QueryTee #
#################
Expand Down
12 changes: 1 addition & 11 deletions docs/sources/setup/install/helm/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2572,7 +2572,7 @@ null
},
"canarySecret": null,
"cluster_name": null,
"config": "{{- if .Values.enterprise.adminApi.enabled }}\n{{- if or .Values.minio.enabled (eq .Values.loki.storage.type \"s3\") (eq .Values.loki.storage.type \"gcs\") (eq .Values.loki.storage.type \"azure\") }}\nadmin_client:\n storage:\n s3:\n bucket_name: {{ .Values.loki.storage.bucketNames.admin }}\n{{- end }}\n{{- end }}\nauth:\n type: {{ .Values.enterprise.adminApi.enabled | ternary \"enterprise\" \"trust\" }}\nauth_enabled: {{ .Values.loki.auth_enabled }}\ncluster_name: {{ include \"loki.clusterName\" . }}\nlicense:\n path: /etc/loki/license/license.jwt\n",
"config": "{{- if .Values.enterprise.adminApi.enabled }}\n{{- if or .Values.minio.enabled (eq .Values.loki.storage.type \"s3\") (eq .Values.loki.storage.type \"gcs\") (eq .Values.loki.storage.type \"azure\") }}\nadmin_client:\n storage:\n s3:\n bucket_name: admin\n{{- end }}\n{{- end }}\nauth:\n type: {{ .Values.enterprise.adminApi.enabled | ternary \"enterprise\" \"trust\" }}\nauth_enabled: {{ .Values.loki.auth_enabled }}\ncluster_name: {{ include \"loki.clusterName\" . }}\nlicense:\n path: /etc/loki/license/license.jwt\n",
"enabled": false,
"externalConfigName": "",
"externalLicenseName": null,
Expand Down Expand Up @@ -5311,11 +5311,6 @@ null
"useManagedIdentity": false,
"userAssignedId": null
},
"bucketNames": {
"admin": "admin",
"chunks": "chunks",
"ruler": "ruler"
},
"filesystem": {
"chunks_directory": "/var/loki/chunks",
"rules_directory": "/var/loki/rules"
Expand Down Expand Up @@ -5777,11 +5772,6 @@ null
"useManagedIdentity": false,
"userAssignedId": null
},
"bucketNames": {
"admin": "admin",
"chunks": "chunks",
"ruler": "ruler"
},
"filesystem": {
"chunks_directory": "/var/loki/chunks",
"rules_directory": "/var/loki/rules"
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 3.0.0
version: 6.0.0
version: 6.1.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
5 changes: 5 additions & 0 deletions production/helm/loki/ci/default-single-binary-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ loki:
commonConfig:
replication_factor: 1
useTestSchema: true
storage:
bucketNames:
chunks: chunks
ruler: ruler
admin: admin
deploymentMode: SingleBinary
singleBinary:
replicas: 1
Expand Down
5 changes: 5 additions & 0 deletions production/helm/loki/ci/default-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ loki:
commonConfig:
replication_factor: 1
useTestSchema: true
storage:
bucketNames:
chunks: chunks
ruler: ruler
admin: admin
read:
replicas: 1
write:
Expand Down
5 changes: 5 additions & 0 deletions production/helm/loki/ci/ingress-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ loki:
commonConfig:
replication_factor: 1
useTestSchema: true
storage:
bucketNames:
chunks: chunks
ruler: ruler
admin: admin
read:
replicas: 1
write:
Expand Down
5 changes: 5 additions & 0 deletions production/helm/loki/ci/legacy-monitoring-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ loki:
commonConfig:
replication_factor: 1
useTestSchema: true
storage:
bucketNames:
chunks: chunks
ruler: ruler
admin: admin
read:
replicas: 1
write:
Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Generated storage config for loki common config
{{- if .Values.minio.enabled -}}
s3:
endpoint: {{ include "loki.minio" $ }}
bucketnames: {{ $.Values.loki.storage.bucketNames.chunks }}
bucketnames: chunks
secret_access_key: {{ $.Values.minio.rootPassword }}
access_key_id: {{ $.Values.minio.rootUser }}
s3forcepathstyle: true
Expand Down Expand Up @@ -346,7 +346,7 @@ Storage config for ruler
{{- if .Values.minio.enabled -}}
type: "s3"
s3:
bucketnames: {{ $.Values.loki.storage.bucketNames.ruler }}

This comment has been minimized.

Copy link
@yoyosir

yoyosir May 6, 2024

Bunch of references like L272 here are not changed. Is that expected?

bucketnames: ruler
{{- else if eq .Values.loki.storage.type "s3" -}}
{{- with .Values.loki.storage.s3 }}
type: "s3"
Expand Down
12 changes: 7 additions & 5 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,12 @@ loki:
compactor_address: '{{ include "loki.compactorAddress" . }}'
# -- Storage config. Providing this will automatically populate all necessary storage configs in the templated config.
storage:
bucketNames:
chunks: chunks
ruler: ruler
admin: admin
# Loki requires a bucket for chunks and the ruler. GEL requires a third bucket for the admin API.
# Please provide these values if you are using object storage.
# bucketNames:
# chunks: FIXME
# ruler: FIXME
# admin: FIXME
type: s3
s3:
s3: null
Expand Down Expand Up @@ -477,7 +479,7 @@ enterprise:
admin_client:
storage:
s3:
bucket_name: {{ .Values.loki.storage.bucketNames.admin }}
bucket_name: admin
{{- end }}
{{- end }}
auth:
Expand Down

0 comments on commit 2e32ec5

Please sign in to comment.