home/charts
2
0
Fork 0
mirror of https://github.com/wahyd4/charts.git synced 2026-08-18 01:25:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana-tempo] Chart standardized (#8688)

Browse Source 
* [bitnami/grafana-tempo] Chart standardized

Signed-off-by: juan131 <juanariza@vmware.com>

* Update deps + requested changes

Signed-off-by: juan131 <juanariza@vmware.com>

* Fix probes ports

Signed-off-by: juan131 <juanariza@vmware.com>

* Fix Query configuration

Signed-off-by: juan131 <juanariza@vmware.com>

* Fix Tempo configuration

Signed-off-by: juan131 <juanariza@vmware.com>

* Fix ingester probes

Signed-off-by: juan131 <juanariza@vmware.com>

* Fix vulture probes

Signed-off-by: juan131 <juanariza@vmware.com>

* [bitnami/grafana-tempo] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Juan Ariza Toledano
2022-01-19 19:48:03 +01:00
committed by GitHub
co-authored by Bitnami Containers
parent 9b7aadc4df
commit d1cf873d46
28 changed files with 1600 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/grafana-tempo/Chart.lock
+3 -3
View File
@@ -4,6 +4,6 @@ dependencies:
version: 1.10.3
- name: memcached
repository: https://charts.bitnami.com/bitnami
version: 5.15.14
digest: sha256:649187759d21e3fce44086320c891ed34e323e8ad37c361c052f3691aa6537c9
generated: "2022-01-15T19:31:30.144603187Z"
version: 6.0.0
digest: sha256:58641f6cbcaed1dcee5dec9013e9594adac4e9c0bec302f050a0f8ae490da87b
generated: "2022-01-19T16:53:23.258095+01:00"
bitnami/grafana-tempo/Chart.yaml
+4 -3
View File
@@ -8,9 +8,10 @@ dependencies:
tags:
- bitnami-common
version: 1.x.x
- name: memcached
- condition: memcached.enabled
name: memcached
repository: https://charts.bitnami.com/bitnami
version: 5.x.x
version: 6.x.x
description: Grafana Tempo is an open source, easy-to-use and high-scale distributed tracing backend.
engine: gotpl
home: https://github.com/grafana/tempo/
@@ -27,4 +28,4 @@ name: grafana-tempo
sources:
- https://github.com/bitnami/bitnami-docker-grafana-tempo
- https://github.com/grafana/tempo/
version: 0.2.18
version: 1.0.0
bitnami/grafana-tempo/README.md
+551 -441
View File
File diff suppressed because it is too large Load Diff
bitnami/grafana-tempo/ci/values-with-init-container-and-metrics.yaml
+6
View File
@@ -0,0 +1,6 @@
volumePermissions:
enabled: true
metrics:
enabled: true
serviceMonitor:
enabled: true
bitnami/grafana-tempo/templates/NOTES.txt
+4 -7
View File
@@ -45,15 +45,12 @@ Installed components:
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ template "common.names.fullname" . }}
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.queryFrontend.service.port }}
echo http://$SERVICE_IP:{{ .Values.queryFrontend.service.ports.http }}
{{- else if contains "ClusterIP" .Values.queryFrontend.service.type }}
echo "The Query Frontend is available at http://127.0.0.1:{{ .Values.queryFrontend.service.port }}"
kubectl port-forward svc/{{ template "grafana-tempo.query-frontend.fullname" . }} {{ .Values.queryFrontend.service.port }}:{{ .Values.queryFrontend.service.port }} &
echo "The Query Frontend is available at http://127.0.0.1:{{ .Values.queryFrontend.service.ports.http }}"
kubectl port-forward svc/{{ template "grafana-tempo.query-frontend.fullname" . }} {{ .Values.queryFrontend.service.ports.http }}:{{ .Values.queryFrontend.service.ports.http }} &
{{- end }}
{{- end }}
{{- include "common.warnings.rollingTag" .Values.tempo.image }}
{{- include "common.warnings.rollingTag" .Values.queryFrontend.query.image }}
{{- include "common.warnings.rollingTag" .Values.vulture.image }}
{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }}
{{- include "grafana-tempo.checkRollingTags" . }}
{{- include "grafana-tempo.validateValues" . }}
bitnami/grafana-tempo/templates/_helpers.tpl
+19 -9
View File
@@ -142,18 +142,28 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- define "grafana-tempo.memcached.url" -}}
{{- $port := "" -}}
{{- if .Values.externalMemcached.host -}}
{{- $servicePortString := printf "%v" .Values.externalMemcached.port -}}
{{- if (not (eq $servicePortString "11211")) -}}
{{- $port = printf ":%s" $servicePortString -}}
{{- end -}}
{{- printf "%s%s" .Values.externalMemcached.host $port }}
{{- $servicePortString := printf "%v" .Values.externalMemcached.port -}}
{{- if (not (eq $servicePortString "11211")) -}}
{{- $port = printf ":%s" $servicePortString -}}
{{- end -}}
{{- printf "%s%s" .Values.externalMemcached.host $port }}
{{- else -}}
{{- $servicePortString := printf "%v" .Values.memcached.service.port -}}
{{- if (not (eq $servicePortString "11211")) -}}
{{- $port = printf ":%s" $servicePortString -}}
{{- $servicePortString := printf "%v" .Values.memcached.service.ports.memcached -}}
{{- if (not (eq $servicePortString "11211")) -}}
{{- $port = printf ":%s" $servicePortString -}}
{{- end -}}
{{- printf "%s%s" (include "grafana-tempo.memcached.fullname" .) $port }}
{{- end -}}
{{- printf "%s%s" (include "grafana-tempo.memcached.fullname" .) $port }}
{{- end -}}
{{/*
Check if there are rolling tags in the images
*/}}
{{- define "grafana-tempo.checkRollingTags" -}}
{{- include "common.warnings.rollingTag" .Values.tempo.image }}
{{- include "common.warnings.rollingTag" .Values.queryFrontend.query.image }}
{{- include "common.warnings.rollingTag" .Values.vulture.image }}
{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }}
{{- end -}}
{{/*
bitnami/grafana-tempo/templates/compactor/deployment.yaml
+20 -17
View File
@@ -51,9 +51,15 @@ spec:
{{- if .Values.compactor.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.compactor.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.compactor.priorityClassName }}
priorityClassName: {{ .Values.compactor.priorityClassName | quote }}
{{- end }}
{{- if .Values.compactor.schedulerName }}
schedulerName: {{ .Values.compactor.schedulerName }}
{{- end }}
{{- if .Values.compactor.podSecurityContext.enabled }}
securityContext: {{- omit .Values.compactor.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -96,44 +102,41 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.compactor.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.tempo.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.web }}
name: http
- containerPort: {{ .Values.tempo.gossipRing.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.gossipRing }}
name: http-memberlist
{{- if .Values.compactor.resources }}
resources: {{- toYaml .Values.compactor.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.compactor.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.compactor.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.compactor.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.compactor.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.compactor.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.compactor.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.compactor.livenessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.compactor.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.compactor.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.compactor.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.compactor.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.compactor.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.compactor.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.compactor.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.compactor.readinessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.compactor.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.compactor.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.compactor.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.compactor.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.compactor.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf/tempo.yaml
bitnami/grafana-tempo/templates/compactor/service.yaml
+5 -1
View File
@@ -20,6 +20,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.compactor.service.type }}
sessionAffinity: {{ .Values.compactor.service.sessionAffinity }}
{{- if .Values.compactor.service.clusterIP }}
clusterIP: {{ .Values.compactor.service.clusterIP }}
{{- end }}
@@ -34,7 +35,7 @@ spec:
{{- end }}
ports:
- name: http
port: {{ .Values.compactor.service.port }}
port: {{ .Values.compactor.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.compactor.service.type "NodePort") (eq .Values.compactor.service.type "LoadBalancer")) (not (empty .Values.compactor.service.nodePorts.http))) }}
@@ -42,6 +43,9 @@ spec:
{{- else if eq .Values.compactor.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.compactor.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.compactor.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: compactor
{{- end }}
bitnami/grafana-tempo/templates/compactor/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/templates/distributor/deployment.yaml
+21 -18
View File
@@ -50,9 +50,15 @@ spec:
{{- if .Values.distributor.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.distributor.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.distributor.priorityClassName }}
priorityClassName: {{ .Values.distributor.priorityClassName | quote }}
{{- end }}
{{- if .Values.distributor.schedulerName }}
schedulerName: {{ .Values.distributor.schedulerName }}
{{- end }}
{{- if .Values.distributor.podSecurityContext.enabled }}
securityContext: {{- omit .Values.distributor.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -95,11 +101,11 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.distributor.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.tempo.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.web }}
name: http
- containerPort: {{ .Values.tempo.gossipRing.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.gossipRing }}
name: http-memberlist
- containerPort: {{ .Values.tempo.grpcContainerPort }}
- containerPort: {{ .Values.tempo.containerPorts.grpc }}
name: grpc
{{- if .Values.tempo.traces.jaeger.thriftCompact }}
- containerPort: 6831
@@ -146,35 +152,32 @@ spec:
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.distributor.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.distributor.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.distributor.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.distributor.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.distributor.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.distributor.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.distributor.livenessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.distributor.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.distributor.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.distributor.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.distributor.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.distributor.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.distributor.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.distributor.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.distributor.readinessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.distributor.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.distributor.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.distributor.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.distributor.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.distributor.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf/tempo.yaml
bitnami/grafana-tempo/templates/distributor/service.yaml
+6 -2
View File
@@ -19,6 +19,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.distributor.service.type }}
sessionAffinity: {{ .Values.distributor.service.sessionAffinity }}
{{- if .Values.distributor.service.clusterIP }}
clusterIP: {{ .Values.distributor.service.clusterIP }}
{{- end }}
@@ -33,7 +34,7 @@ spec:
{{- end }}
ports:
- name: http
port: {{ .Values.distributor.service.port }}
port: {{ .Values.distributor.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.distributor.service.type "NodePort") (eq .Values.distributor.service.type "LoadBalancer")) (not (empty .Values.distributor.service.nodePorts.http))) }}
@@ -42,7 +43,7 @@ spec:
nodePort: null
{{- end }}
- name: grpc
port: {{ .Values.distributor.service.grpcPort }}
port: {{ .Values.distributor.service.ports.grpc }}
protocol: TCP
targetPort: grpc
{{- if (and (or (eq .Values.distributor.service.type "NodePort") (eq .Values.distributor.service.type "LoadBalancer")) (not (empty .Values.distributor.service.nodePorts.grpc))) }}
@@ -103,5 +104,8 @@ spec:
protocol: TCP
targetPort: opencensus
{{- end }}
{{- if .Values.distributor.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.distributor.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: distributor
bitnami/grafana-tempo/templates/distributor/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/templates/gossip-ring-headless-service.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ spec:
clusterIP: None
ports:
- name: http
port: {{ .Values.tempo.gossipRing.service.port }}
port: {{ .Values.tempo.gossipRing.service.ports.http }}
targetPort: http-memberlist
protocol: TCP
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
bitnami/grafana-tempo/templates/ingester/service.yaml
+6 -2
View File
@@ -19,6 +19,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.ingester.service.type }}
sessionAffinity: {{ .Values.ingester.service.sessionAffinity }}
{{- if .Values.ingester.service.clusterIP }}
clusterIP: {{ .Values.ingester.service.clusterIP }}
{{- end }}
@@ -33,7 +34,7 @@ spec:
{{- end }}
ports:
- name: http
port: {{ .Values.ingester.service.port }}
port: {{ .Values.ingester.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.ingester.service.type "NodePort") (eq .Values.ingester.service.type "LoadBalancer")) (not (empty .Values.ingester.service.nodePorts.http))) }}
@@ -42,7 +43,7 @@ spec:
nodePort: null
{{- end }}
- name: grpc
port: {{ .Values.ingester.service.grpcPort }}
port: {{ .Values.ingester.service.ports.grpc }}
targetPort: grpc
protocol: TCP
{{- if (and (or (eq .Values.ingester.service.type "NodePort") (eq .Values.ingester.service.type "LoadBalancer")) (not (empty .Values.ingester.service.nodePorts.grpc))) }}
@@ -50,5 +51,8 @@ spec:
{{- else if eq .Values.ingester.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.ingester.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingester.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: ingester
bitnami/grafana-tempo/templates/ingester/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/templates/ingester/statefulset.yaml
+34 -30
View File
@@ -51,9 +51,15 @@ spec:
{{- if .Values.ingester.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.ingester.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.ingester.priorityClassName }}
priorityClassName: {{ .Values.ingester.priorityClassName | quote }}
{{- end }}
{{- if .Values.ingester.schedulerName }}
schedulerName: {{ .Values.ingester.schedulerName }}
{{- end }}
{{- if .Values.ingester.podSecurityContext.enabled }}
securityContext: {{- omit .Values.ingester.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -67,12 +73,12 @@ spec:
imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
command:
- /bin/bash
- -ec
args:
- -ec
- |
mkdir -p {{ .Values.tempo.dataDir }}{{- if .Values.ingester.persistence.subPath }}/{{ .Values.ingester.persistence.subPath }}{{- end }}
{{- if and .Values.podSecurityContext.enabled .Values.containerSecurityContext.enabled }}
chown -R "{{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }}" "{{ .Values.tempo.dataDir }}{{- if .Values.ingester.persistence.subPath }}/{{ .Values.ingester.persistence.subPath }}{{- end }}"
{{- if and .Values.ingester.podSecurityContext.enabled .Values.ingester.containerSecurityContext.enabled }}
find {{ .Values.tempo.dataDir }}{{- if .Values.ingester.persistence.subPath }}/{{ .Values.ingester.persistence.subPath }}{{- end }} -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | xargs chown -R {{ .Values.ingester.containerSecurityContext.runAsUser }}:{{ .Values.ingester.podSecurityContext.fsGroup }}
{{- end }}
{{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }}
@@ -121,44 +127,41 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.ingester.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.tempo.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.web }}
name: http
- containerPort: {{ .Values.tempo.gossipRing.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.gossipRing }}
name: http-memberlist
- containerPort: {{ .Values.tempo.grpcContainerPort }}
- containerPort: {{ .Values.tempo.containerPorts.grpc }}
name: grpc
{{- if .Values.ingester.resources }}
resources: {{- toYaml .Values.ingester.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.ingester.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.livenessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
initialDelaySeconds: {{ .Values.ingester.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.ingester.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.ingester.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.ingester.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.ingester.livenessProbe.failureThreshold }}
{{- else if .Values.ingester.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ingester.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.readinessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
initialDelaySeconds: {{ .Values.ingester.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.ingester.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.ingester.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.ingester.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.ingester.readinessProbe.failureThreshold }}
{{- else if .Values.ingester.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ingester.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ingester.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.ingester.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf/tempo.yaml
@@ -191,9 +194,16 @@ spec:
volumeClaimTemplates:
- metadata:
name: data
{{- if .Values.ingester.persistence.annotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.annotations "context" $) | nindent 10 }}
{{- if .Values.commonLabels }}
labels: {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 10 }}
{{- end }}
annotations:
{{- if .Values.ingester.persistence.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.annotations "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 10 }}
{{- end }}
spec:
accessModes:
{{- range .Values.ingester.persistence.accessModes }}
@@ -202,14 +212,8 @@ spec:
resources:
requests:
storage: {{ .Values.ingester.persistence.size | quote }}
{{- if .Values.ingester.persistence.volumeClaimTemplates.requests }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.volumeClaimTemplates.requests "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ingester.persistence.volumeClaimTemplates.dataSource }}
dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.volumeClaimTemplates.dataSource "context" $) | nindent 10 }}
{{- if .Values.ingester.persistence.selector }}
selector: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.selector "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.ingester.persistence.volumeClaimTemplates.selector }}
selector: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.persistence.volumeClaimTemplates.selector "context" $) | nindent 10 }}
{{- end }}
{{ include "common.storage.class" (dict "persistence" .Values.ingester.persistence "global" .Values.global) }}
{{- include "common.storage.class" (dict "persistence" .Values.ingester.persistence "global" .Values.global) | nindent 8 }}
{{- end }}
bitnami/grafana-tempo/templates/querier/deployment.yaml
+21 -18
View File
@@ -50,9 +50,15 @@ spec:
{{- if .Values.querier.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.querier.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.querier.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.querier.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.querier.priorityClassName }}
priorityClassName: {{ .Values.querier.priorityClassName | quote }}
{{- end }}
{{- if .Values.querier.schedulerName }}
schedulerName: {{ .Values.querier.schedulerName }}
{{- end }}
{{- if .Values.querier.podSecurityContext.enabled }}
securityContext: {{- omit .Values.querier.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -95,46 +101,43 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.querier.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.tempo.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.web }}
name: http
- containerPort: {{ .Values.tempo.gossipRing.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.gossipRing }}
name: http-memberlist
- containerPort: {{ .Values.tempo.grpcContainerPort }}
- containerPort: {{ .Values.tempo.containerPorts.grpc }}
name: grpc
{{- if .Values.querier.resources }}
resources: {{- toYaml .Values.querier.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.querier.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.querier.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.querier.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.querier.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.querier.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.querier.livenessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.querier.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.querier.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.querier.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.querier.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.querier.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.querier.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.querier.readinessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.querier.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.querier.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.querier.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.querier.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.querier.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf/tempo.yaml
bitnami/grafana-tempo/templates/querier/service.yaml
+6 -2
View File
@@ -19,6 +19,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.querier.service.type }}
sessionAffinity: {{ .Values.querier.service.sessionAffinity }}
{{- if .Values.querier.service.clusterIP }}
clusterIP: {{ .Values.querier.service.clusterIP }}
{{- end }}
@@ -33,7 +34,7 @@ spec:
{{- end }}
ports:
- name: http
port: {{ .Values.querier.service.port }}
port: {{ .Values.querier.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.querier.service.type "NodePort") (eq .Values.querier.service.type "LoadBalancer")) (not (empty .Values.querier.service.nodePorts.http))) }}
@@ -42,7 +43,7 @@ spec:
nodePort: null
{{- end }}
- name: grpc
port: {{ .Values.querier.service.grpcPort }}
port: {{ .Values.querier.service.ports.grpc }}
targetPort: grpc
protocol: TCP
{{- if (and (or (eq .Values.querier.service.type "NodePort") (eq .Values.querier.service.type "LoadBalancer")) (not (empty .Values.querier.service.nodePorts.grpc))) }}
@@ -50,5 +51,8 @@ spec:
{{- else if eq .Values.querier.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.querier.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.querier.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: querier
bitnami/grafana-tempo/templates/querier/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/templates/query-frontend/deployment.yaml
+33 -33
View File
@@ -50,9 +50,15 @@ spec:
{{- if .Values.queryFrontend.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.queryFrontend.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.queryFrontend.priorityClassName }}
priorityClassName: {{ .Values.queryFrontend.priorityClassName | quote }}
{{- end }}
{{- if .Values.queryFrontend.schedulerName }}
schedulerName: {{ .Values.queryFrontend.schedulerName }}
{{- end }}
{{- if .Values.queryFrontend.podSecurityContext.enabled }}
securityContext: {{- omit .Values.queryFrontend.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -95,46 +101,43 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.queryFrontend.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.tempo.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.web }}
name: http
- containerPort: {{ .Values.tempo.gossipRing.containerPort }}
- containerPort: {{ .Values.tempo.containerPorts.gossipRing }}
name: http-memberlist
- containerPort: {{ .Values.tempo.grpcContainerPort }}
- containerPort: {{ .Values.tempo.containerPorts.grpc }}
name: grpc
{{- if .Values.queryFrontend.resources }}
resources: {{- toYaml .Values.queryFrontend.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.queryFrontend.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.queryFrontend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.queryFrontend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.queryFrontend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.queryFrontend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.queryFrontend.livenessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.queryFrontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.queryFrontend.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /ready
port: http
initialDelaySeconds: {{ .Values.queryFrontend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.queryFrontend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.queryFrontend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.queryFrontend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.queryFrontend.readinessProbe.failureThreshold }}
port: {{ .Values.tempo.containerPorts.web }}
{{- else if .Values.queryFrontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.queryFrontend.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.queryFrontend.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.queryFrontend.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf/tempo.yaml
@@ -179,42 +182,39 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.queryFrontend.query.jaegerUIContainerPort }}
- containerPort: {{ .Values.queryFrontend.query.containerPorts.jaegerUI }}
name: jaeger-ui
- containerPort: {{ .Values.queryFrontend.query.jaegerMetricsContainerPort }}
- containerPort: {{ .Values.queryFrontend.query.containerPorts.jaegerMetrics }}
name: jaeger-metrics
{{- if .Values.queryFrontend.query.resources }}
resources: {{- toYaml .Values.queryFrontend.query.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.queryFrontend.query.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.query.livenessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: jaeger-ui
initialDelaySeconds: {{ .Values.queryFrontend.query.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.queryFrontend.query.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.queryFrontend.query.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.queryFrontend.query.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.queryFrontend.query.livenessProbe.failureThreshold }}
{{- else if .Values.queryFrontend.query.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.queryFrontend.query.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.query.readinessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: jaeger-ui
initialDelaySeconds: {{ .Values.queryFrontend.query.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.queryFrontend.query.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.queryFrontend.query.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.queryFrontend.query.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.queryFrontend.query.readinessProbe.failureThreshold }}
{{- else if .Values.queryFrontend.query.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.queryFrontend.query.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryFrontend.query.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: jaeger-ui
{{- else if .Values.queryFrontend.query.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.queryFrontend.query.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-query-config
mountPath: /bitnami/grafana-tempo/conf
bitnami/grafana-tempo/templates/query-frontend/headless-service.yaml
+2 -2
View File
@@ -18,11 +18,11 @@ spec:
clusterIP: None
ports:
- name: http
port: {{ .Values.queryFrontend.service.port }}
port: {{ .Values.queryFrontend.service.ports.http }}
targetPort: http
protocol: TCP
- name: grpc
port: {{ .Values.queryFrontend.service.grpcPort }}
port: {{ .Values.queryFrontend.service.ports.grpc }}
targetPort: grpc
protocol: TCP
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
bitnami/grafana-tempo/templates/query-frontend/service.yaml
+6 -2
View File
@@ -19,6 +19,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.queryFrontend.service.type }}
sessionAffinity: {{ .Values.queryFrontend.service.sessionAffinity }}
{{- if .Values.queryFrontend.service.clusterIP }}
clusterIP: {{ .Values.queryFrontend.service.clusterIP }}
{{- end }}
@@ -34,7 +35,7 @@ spec:
publishNotReadyAddresses: true
ports:
- name: http
port: {{ .Values.queryFrontend.service.port }}
port: {{ .Values.queryFrontend.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.queryFrontend.service.type "NodePort") (eq .Values.queryFrontend.service.type "LoadBalancer")) (not (empty .Values.queryFrontend.service.nodePorts.http))) }}
@@ -43,8 +44,11 @@ spec:
nodePort: null
{{- end }}
- name: grpc
port: {{ .Values.queryFrontend.service.grpcPort }}
port: {{ .Values.queryFrontend.service.ports.grpc }}
targetPort: grpc
protocol: TCP
{{- if .Values.queryFrontend.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: query-frontend
bitnami/grafana-tempo/templates/query-frontend/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/templates/service-account.yaml
+10 -5
View File
@@ -2,14 +2,19 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "grafana-tempo.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: tempo
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
name: {{ template "grafana-tempo.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
annotations:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.serviceAccount.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }}
{{- end }}
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
{{- end }}
bitnami/grafana-tempo/templates/vulture/deployment.yaml
+21 -18
View File
@@ -50,9 +50,15 @@ spec:
{{- if .Values.vulture.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.tolerations "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.vulture.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.vulture.priorityClassName }}
priorityClassName: {{ .Values.vulture.priorityClassName | quote }}
{{- end }}
{{- if .Values.vulture.schedulerName }}
schedulerName: {{ .Values.vulture.schedulerName }}
{{- end }}
{{- if .Values.vulture.podSecurityContext.enabled }}
securityContext: {{- omit .Values.vulture.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
@@ -78,9 +84,9 @@ spec:
args: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.args "context" $) | nindent 12 }}
{{- else }}
args:
- -prometheus-listen-address=0.0.0.0:{{ .Values.vulture.containerPort }}
- -prometheus-listen-address=0.0.0.0:{{ .Values.vulture.containerPorts.http }}
- -tempo-push-url=http://{{ template "grafana-tempo.distributor.fullname" . }}
- -tempo-query-url=http://{{ template "grafana-tempo.query-frontend.fullname" . }}:{{ .Values.queryFrontend.service.port }}
- -tempo-query-url=http://{{ template "grafana-tempo.query-frontend.fullname" . }}:{{ .Values.queryFrontend.service.ports.http }}
{{- end }}
{{- if .Values.vulture.extraEnvVars }}
env: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.extraEnvVars "context" $) | nindent 12 }}
@@ -95,42 +101,39 @@ spec:
name: {{ include "common.tplvalues.render" (dict "value" .Values.vulture.extraEnvVarsSecret "context" $) }}
{{- end }}
ports:
- containerPort: {{ .Values.vulture.containerPort }}
- containerPort: {{ .Values.vulture.containerPorts.http }}
name: http
{{- if .Values.vulture.resources }}
resources: {{- toYaml .Values.vulture.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.vulture.livenessProbe.enabled }}
livenessProbe:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.vulture.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http
initialDelaySeconds: {{ .Values.vulture.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.vulture.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.vulture.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.vulture.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.vulture.livenessProbe.failureThreshold }}
port: {{ .Values.vulture.containerPorts.http }}
{{- else if .Values.vulture.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.vulture.readinessProbe.enabled }}
readinessProbe:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.vulture.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http
initialDelaySeconds: {{ .Values.vulture.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.vulture.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.vulture.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.vulture.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.vulture.readinessProbe.failureThreshold }}
port: {{ .Values.vulture.containerPorts.http }}
{{- else if .Values.vulture.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.vulture.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.vulture.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.vulture.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.vulture.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts:
- name: tempo-config
mountPath: /bitnami/grafana-tempo/conf
bitnami/grafana-tempo/templates/vulture/service.yaml
+7 -3
View File
@@ -20,6 +20,7 @@ metadata:
{{- end }}
spec:
type: {{ .Values.vulture.service.type }}
sessionAffinity: {{ .Values.vulture.service.sessionAffinity }}
{{- if .Values.vulture.service.clusterIP }}
clusterIP: {{ .Values.vulture.service.clusterIP }}
{{- end }}
@@ -33,15 +34,18 @@ spec:
loadBalancerIP: {{ .Values.vulture.service.loadBalancerIP }}
{{- end }}
ports:
- name: prom-metrics
port: {{ .Values.vulture.service.port }}
targetPort: prom-metrics
- name: http
port: {{ .Values.vulture.service.ports.http }}
targetPort: http
protocol: TCP
{{- if (and (or (eq .Values.vulture.service.type "NodePort") (eq .Values.vulture.service.type "LoadBalancer")) (not (empty .Values.vulture.service.nodePorts.http))) }}
nodePort: {{ .Values.vulture.service.nodePorts.http }}
{{- else if eq .Values.vulture.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.vulture.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.vulture.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: vulture
{{- end }}
bitnami/grafana-tempo/templates/vulture/servicemonitor.yaml
+15
View File
@@ -13,10 +13,16 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
@@ -31,6 +37,15 @@ spec:
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
bitnami/grafana-tempo/values.yaml
+724 -485
View File
File diff suppressed because it is too large Load Diff