Skip to content

Commit 311d3b4

Browse files
feat: add join_members to memberlist configuration
1 parent 1f37444 commit 311d3b4

File tree

1 file changed

+47
-29
lines changed

1 file changed

+47
-29
lines changed

charts/tempo-distributed/values.yaml

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ global:
1111
# -- Overrides the priorityClassName for all pods
1212
priorityClassName: null
1313
# -- configures cluster domain ("cluster.local" by default)
14-
clusterDomain: 'cluster.local'
14+
clusterDomain: "cluster.local"
1515
# -- configures DNS service name
16-
dnsService: 'kube-dns'
16+
dnsService: "kube-dns"
1717
# -- configures DNS service namespace
18-
dnsNamespace: 'kube-system'
18+
dnsNamespace: "kube-system"
1919
# -- Common environment variables to add to all pods directly managed by this chart.
2020
# scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen
2121
extraEnv: []
@@ -27,7 +27,7 @@ global:
2727
extraArgs: []
2828
# -- Global storage class to be used for persisted components
2929
storageClass: null
30-
fullnameOverride: ''
30+
fullnameOverride: ""
3131
# fullnameOverride: tempo
3232

3333
# -- Configuration is loaded from the secret called 'externalConfigSecretName'.
@@ -48,7 +48,7 @@ externalConfigSecretName: '{{ include "tempo.resourceName" (dict "ctx" . "compon
4848
externalRuntimeConfigName: '{{ include "tempo.resourceName" (dict "ctx" . "component" "runtime") }}'
4949

5050
# -- When 'useExternalConfig' is true, then changing 'externalConfigVersion' triggers restart of services - otherwise changes to the configuration cause a restart.
51-
externalConfigVersion: '0'
51+
externalConfigVersion: "0"
5252

5353
# -- If true, Tempo will report anonymous usage data about the shape of a deployment to Grafana Labs
5454
reportingEnabled: true
@@ -103,10 +103,10 @@ tempo:
103103
# -- Configure the IP families for all tempo services
104104
# See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core
105105
ipFamilies:
106-
- 'IPv4'
106+
- "IPv4"
107107
# - 'IPv6'
108108
# -- Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack
109-
ipFamilyPolicy: 'SingleStack'
109+
ipFamilyPolicy: "SingleStack"
110110
serviceAccount:
111111
# -- Specifies whether a ServiceAccount should be created
112112
create: true
@@ -460,7 +460,21 @@ metricsGenerator:
460460
# -- Additional dimensions to add to the metrics along with the default dimensions.
461461
# -- The resource and span attributes to be added to the span metrics, if present.
462462
dimensions: []
463-
histogram_buckets: [0.002, 0.004, 0.008, 0.016, 0.032, 0.064, 0.128, 0.256, 0.512, 1.02, 2.05, 4.10]
463+
histogram_buckets:
464+
[
465+
0.002,
466+
0.004,
467+
0.008,
468+
0.016,
469+
0.032,
470+
0.064,
471+
0.128,
472+
0.256,
473+
0.512,
474+
1.02,
475+
2.05,
476+
4.10,
477+
]
464478
storage:
465479
path: /var/tempo/wal
466480
wal:
@@ -523,7 +537,7 @@ distributor:
523537
# -- Type of service for the distributor
524538
type: ClusterIP
525539
# -- If type is LoadBalancer you can assign the IP to the LoadBalancer
526-
loadBalancerIP: ''
540+
loadBalancerIP: ""
527541
# -- If type is LoadBalancer limit incoming traffic from IPs.
528542
loadBalancerSourceRanges: []
529543
# -- If type is LoadBalancer you can set it to 'Local' [preserve the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip)
@@ -768,7 +782,7 @@ compactor:
768782
dnsConfig:
769783
options:
770784
- name: ndots
771-
value: "3" # This is required for Azure Kubernetes Service (AKS) https://github.com/grafana/tempo/issues/1462
785+
value: "3" # This is required for Azure Kubernetes Service (AKS) https://github.com/grafana/tempo/issues/1462
772786

773787
# Configuration for the querier
774788
querier:
@@ -1185,7 +1199,7 @@ enterpriseFederationFrontend:
11851199
multitenancyEnabled: false
11861200

11871201
rollout_operator:
1188-
# -- Enable rollout-operator. It must be enabled when using Zone Aware Replication.
1202+
# -- Enable rollout-operator. It must be enabled when using Zone Aware Replication.
11891203
enabled: false
11901204

11911205
podSecurityContext:
@@ -1273,6 +1287,7 @@ memberlist:
12731287
bind_port: 7946
12741288
packet_dial_timeout: "5s"
12751289
packet_write_timeout: "5s"
1290+
join_members: ""
12761291

12771292
# -- Config file contents for Tempo distributed. Passed through the `tpl` function to allow templating
12781293

@@ -1531,8 +1546,13 @@ config: |
15311546
{{- with .Values.memberlist }}
15321547
{{- toYaml . | nindent 2 }}
15331548
{{- end }}
1549+
{{- if .Values.memberlist.join_members }}
1550+
join_members:
1551+
- {{ .Values.memberlist.join_members }}
1552+
{{- else }}
15341553
join_members:
15351554
- dns+{{ include "tempo.fullname" . }}-gossip-ring:{{ .Values.memberlist.bind_port }}
1555+
{{- end }}
15361556
overrides:
15371557
{{- toYaml .Values.overrides | nindent 2 }}
15381558
server:
@@ -1843,19 +1863,19 @@ metaMonitoring:
18431863
# configuration to write logs to this Loki-compatible remote. Optional.
18441864
remote:
18451865
# -- Full URL for Loki push endpoint. Usually ends in /loki/api/v1/push
1846-
url: ''
1866+
url: ""
18471867

18481868
auth:
18491869
# -- Used to set X-Scope-OrgID header on requests. Usually not used in combination with username and password.
1850-
tenantId: ''
1870+
tenantId: ""
18511871

18521872
# -- Basic authentication username. Optional.
1853-
username: ''
1873+
username: ""
18541874

18551875
# -- The value under key passwordSecretKey in this secret will be used as the basic authentication password. Required only if passwordSecretKey is set.
1856-
passwordSecretName: ''
1876+
passwordSecretName: ""
18571877
# -- The value under this key in passwordSecretName will be used as the basic authentication password. Required only if passwordSecretName is set.
1858-
passwordSecretKey: ''
1878+
passwordSecretKey: ""
18591879

18601880
# -- Client configurations for the LogsInstance that will scrape Mimir pods. Follows the format of .remote.
18611881
additionalClientConfigs: []
@@ -1866,18 +1886,18 @@ metaMonitoring:
18661886
# Note that you need to configure serviceMonitor in order to have some metrics available.
18671887
remote:
18681888
# -- Full URL for Prometheus remote-write. Usually ends in /push
1869-
url: ''
1889+
url: ""
18701890

18711891
# -- Used to add HTTP headers to remote-write requests.
18721892
headers: {}
18731893
auth:
18741894
# -- Basic authentication username. Optional.
1875-
username: ''
1895+
username: ""
18761896

18771897
# -- The value under key passwordSecretKey in this secret will be used as the basic authentication password. Required only if passwordSecretKey is set.
1878-
passwordSecretName: ''
1898+
passwordSecretName: ""
18791899
# -- The value under this key in passwordSecretName will be used as the basic authentication password. Required only if passwordSecretName is set.
1880-
passwordSecretKey: ''
1900+
passwordSecretKey: ""
18811901

18821902
# -- Additional remote-write for the MetricsInstance that will scrape Mimir pods. Follows the format of .remote.
18831903
additionalRemoteWriteConfigs: []
@@ -1895,7 +1915,7 @@ metaMonitoring:
18951915
app.kubernetes.io/name: kube-state-metrics
18961916

18971917
# -- Sets the namespace of the resources. Leave empty or unset to use the same namespace as the Helm release.
1898-
namespace: ''
1918+
namespace: ""
18991919

19001920
# -- Labels to add to all monitoring.grafana.com custom resources.
19011921
# Does not affect the ServiceMonitors for kubernetes metrics; use serviceMonitor.labels for that.
@@ -1951,7 +1971,7 @@ minio:
19511971
cpu: 100m
19521972
memory: 128Mi
19531973
# Changed the mc config path to '/tmp' from '/etc' as '/etc' is only writable by root and OpenShift will not permit this.
1954-
configPathmc: '/tmp/minio/mc/'
1974+
configPathmc: "/tmp/minio/mc/"
19551975

19561976
# Configuration for the gateway
19571977
gateway:
@@ -2116,11 +2136,11 @@ gateway:
21162136
'"$request" $body_bytes_sent "$http_referer" '
21172137
'"$http_user_agent" "$http_x_forwarded_for"';
21182138
# -- Allows appending custom configuration to the server block
2119-
serverSnippet: ''
2139+
serverSnippet: ""
21202140
# -- Allows appending custom configuration to the http block
2121-
httpSnippet: ''
2141+
httpSnippet: ""
21222142
# -- Allows overriding the DNS resolver address nginx will use
2123-
resolver: ''
2143+
resolver: ""
21242144
# -- Config file contents for Nginx. Passed through the `tpl` function to allow templating
21252145
# @default -- See values.yaml
21262146
file: |
@@ -2304,7 +2324,7 @@ enterprise:
23042324
# To set the license contents, use the flag `--set-file 'license.contents=./license.jwt'`
23052325
# To use your own Kubernetes Secret, `--set license.external=true`.
23062326
license:
2307-
contents: 'NOTAVALIDLICENSE'
2327+
contents: "NOTAVALIDLICENSE"
23082328
external: false
23092329
secretName: '{{ include "tempo.resourceName" (dict "ctx" . "component" "license") }}'
23102330

@@ -2393,7 +2413,6 @@ provisioner:
23932413
# -- Volumes to add to the provisioner pods
23942414
extraVolumes: []
23952415

2396-
23972416
kubectlImage:
23982417
repository: alpine/kubectl
23992418
tag: latest
@@ -2576,8 +2595,7 @@ enterpriseGateway:
25762595
{{- include "tempo.selectorLabels" (dict "ctx" . "component" "enterprise-gateway") | nindent 12 }}
25772596
topologyKey: topology.kubernetes.io/zone
25782597
2579-
securityContext:
2580-
{}
2598+
securityContext: {}
25812599

25822600
# -- The SecurityContext for enterprise-gateway containers
25832601
containerSecurityContext:

0 commit comments

Comments
 (0)