Skip to content
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
913401c
Update _helpers.tpl
horihel Aug 6, 2024
466009a
Update Chart.yaml
horihel Aug 6, 2024
3079030
Update CHANGELOG.md
horihel Aug 6, 2024
06730bd
Update README.md
horihel Aug 6, 2024
4e53946
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Aug 7, 2024
f64f46f
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Aug 8, 2024
70ee6a0
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Aug 8, 2024
b00e48b
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Aug 9, 2024
4681c9a
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Mar 31, 2025
7586e36
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Apr 8, 2025
f7c7b2d
Update _helpers.tpl
horihel Jul 15, 2025
da8aeaa
Apply suggestions from code review
horihel Jul 18, 2025
29002d9
remove version bumps
horihel Jul 18, 2025
5caaaea
move validation of bucketNames into validate.yaml
horihel Jul 18, 2025
9a980cb
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Jul 18, 2025
4e56083
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Jul 21, 2025
bfdcd85
check for adminApi before validating "admin" bucketName
horihel Jul 21, 2025
85788fe
Update production/helm/loki/templates/validate.yaml
horihel Jul 22, 2025
9c42ca5
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Jul 23, 2025
66628a3
Revert bucketname change in _helpers.tpl, change to validation-only
horihel Jul 23, 2025
3661aa0
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Jul 24, 2025
a24722a
Merge branch 'main' into horihel-work-around-helm-lint-bug
horihel Jul 24, 2025
29cfa33
revert de-dupe/sort
horihel Jul 24, 2025
303b041
Merge branch 'main' into horihel-work-around-helm-lint-bug
JStickler Jul 24, 2025
25184fd
Update production/helm/loki/templates/validate.yaml
horihel Jul 28, 2025
f16fc15
Merge branch 'main' into horihel-work-around-helm-lint-bug
JStickler Jul 28, 2025
f8825db
Update production/helm/loki/templates/validate.yaml
horihel Jul 29, 2025
72e8687
Merge branch 'main' into horihel-work-around-helm-lint-bug
Jayclifford345 Jul 29, 2025
0bcc2fc
Merge branch 'main' into horihel-work-around-helm-lint-bug
Jayclifford345 Jul 29, 2025
f685e16
Merge branch 'main' into horihel-work-around-helm-lint-bug
Jayclifford345 Jul 29, 2025
3192b38
Merge branch 'main' into horihel-work-around-helm-lint-bug
Jayclifford345 Jul 29, 2025
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
3 changes: 3 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Entries should be ordered as follows:
Entries should include a reference to the pull request that introduced the change.

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : 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.)

- [BUGFIX] Add validation for loki.storage.bucketNames [#13781](https://github.com/grafana/loki/pull/13781)

## 6.33.0

- [FEATURE] Allow passing tenant password hash instead of password. [#17049](https://github.com/grafana/loki/pull/17049)
Expand Down
15 changes: 15 additions & 0 deletions production/helm/loki/templates/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,19 @@

{{- if and (empty .Values.loki.schemaConfig) (empty .Values.loki.structuredConfig.schema_config) (not .Values.loki.useTestSchema) }}
{{- fail "You must provide a schema_config for Loki, one is not provided as this will be individual for every Loki cluster. See https://grafana.com/docs/loki/latest/operations/storage/schema/ for schema information. For quick testing (with no persistence) add `--set loki.useTestSchema=true`"}}
{{- end }}

{{- if (eq (include "loki.isUsingObjectStorage" . ) "true") }}
{{- $bucketNames := .Values.loki.storage.bucketNames -}}
{{- if not (hasKey $bucketNames "chunks") }}
{{- fail "Please define loki.storage.bucketName.chunks" }}
{{- end }}

{{- if not (hasKey $bucketNames "ruler") }}
{{- fail "Please define loki.storage.bucketName.ruler" }}
{{- end }}

{{- if and (.Values.enterprise.adminApi.enabled) (not (hasKey $bucketNames "admin")) }}
{{- fail "Please define loki.storage.bucketName.admin" }}
{{- end }}
{{- end }}
Loading