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.

Sign up for GitHub

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

feat(thanos): Added support for disabling compact dedupe #837

Merged
merged 1 commit into from
Dec 4, 2023
Merged

feat(thanos): Added support for disabling compact dedupe #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions charts/thanos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED]

### Added

- Added `compact.deduplication.enabled` value to disable compact deduplication.
- Added `compact.deduplication.func` value to set the compact deduplication function.

### Changed

- Changed the default `configmap-reload` image variant to `cgr.dev/chainguard/configmap-reload:latest`.
- Added support for specifying custom Kubernetes cluster domain

### Deprecated

- Deprecated the `compact.replicaDeduplication` value in favour of setting `compact.deduplication.func=penalty`.

## [v1.14.5] - 2023-10-20

### Changed
Expand Down
3 changes: 3 additions & 0 deletions charts/thanos/ci/ci-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
compact:
enabled: false

deduplication:
enabled: false

queryFrontend:
enabled: true

Expand Down
4 changes: 3 additions & 1 deletion charts/thanos/ci/kubeconform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ compact:
persistence:
enabled: true

replicaDeduplication: true
deduplication:
enabled: true
func: penalty

nodeSelector:
kubernetes.io/os: linux
Expand Down
6 changes: 5 additions & 1 deletion charts/thanos/templates/compact/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ spec:
- --http-address=0.0.0.0:10902
- --data-dir=/var/thanos/compact
- --objstore.config-file=/etc/thanos/objstore.yaml
{{- if .Values.compact.deduplication.enabled }}
{{- range (concat .Values.additionalReplicaLabels (ternary (list "rule_replica") (list) .Values.rule.enabled ) (ternary (list "receive_replica") (list) .Values.receive.enabled )) | uniq }}
- --deduplication.replica-label={{ . }}
{{- end }}
{{- if .Values.compact.replicaDeduplication }}
{{- if .Values.compact.deduplication.func }}
- --deduplication.func={{ .Values.compact.deduplication.func }}
{{- else if .Values.compact.replicaDeduplication }}
- --deduplication.func=penalty
{{- end }}
{{- end }}
{{- with .Values.compact.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions charts/thanos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ compact:

extraEnv: []

deduplication:
enabled: true
func:

replicaDeduplication: false

extraArgs: []
Expand Down