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

Bucket Web: Extend configuration for labels and refresh #209

Merged
merged 3 commits into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel

- [#192](https://github.com/thanos-io/kube-thanos/pull/192) sidecar: Add pod discovery
- [#194](https://github.com/thanos-io/kube-thanos/pull/194) Allow configuring --label and --receive.tenant-label-name flags.
- [#209](https://github.com/thanos-io/kube-thanos/pull/209) Allow configuring --label and --refresh flags of bucket web.

### Fixed

Expand Down
3 changes: 2 additions & 1 deletion all.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ local commonConfig = {

local b = t.bucket(commonConfig {
replicas: 1,

label: 'cluster_name',
refresh: '5m',
// Example on how to overwrite the tracing config on a per component basis
// tracing+: {
// config+: {
Expand Down
2 changes: 2 additions & 0 deletions examples/all/manifests/thanos-bucket-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
"sampler_type": "ratelimiting"
"service_name": "thanos-bucket"
"type": "JAEGER"
- --label=cluster_name
- --refresh=5m
env:
- name: OBJSTORE_CONFIG
valueFrom:
Expand Down
8 changes: 8 additions & 0 deletions jsonnet/kube-thanos/kube-thanos-bucket.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ function(params) {
{ config+: { service_name: defaults.name } } + tb.config.tracing
),
] else []
) + (
if std.objectHas(tb.config, 'label') then [
'--label=' + tb.config.label,
] else []
) + (
if std.objectHas(tb.config, 'refresh') then [
'--refresh=' + tb.config.refresh,
] else []
),
securityContext: {
runAsUser: 65534,
Expand Down