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

Jump to bottom

Feature/tolerations affinity #1

Open
wants to merge 3 commits into
base: anova-custom
Choose a base branch
from
Open

Feature/tolerations affinity #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb33ac
feat: ✨ Add ability to define tolerations and affinity/nodeSelector
daniel-anova Mar 29, 2021
0495b33
feat: ✨ Add ability to define tolerations and affinity/nodeSelector
daniel-anova Mar 29, 2021
9f6d202
Merge branch 'feature/tolerations-affinity' of https://github.com/dan…
daniel-anova Mar 29, 2021
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
8 changes: 7 additions & 1 deletion operations/helm/tempo-microservices/templates/deployment-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@ spec:
volumes:
- configMap:
name: tempo-compactor
name: tempo-conf
name: tempo-conf
{{- with .Values.compactor.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
affinity:
{{- toYaml .Values.compactor.affinity | nindent 8 }}
6 changes: 6 additions & 0 deletions operations/helm/tempo-microservices/templates/deployment-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,9 @@ spec:
- configMap:
name: tempo
name: tempo-conf
{{- with .Values.distributor.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
affinity:
{{- toYaml .Values.distributor.affinity | nindent 8 }}
8 changes: 7 additions & 1 deletion operations/helm/tempo-microservices/templates/deployment-querier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,10 @@ spec:
volumes:
- configMap:
name: tempo-querier
name: tempo-conf
name: tempo-conf
{{- with .Values.querier.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
affinity:
{{- toYaml .Values.querier.affinity | nindent 8 }}
6 changes: 6 additions & 0 deletions operations/helm/tempo-microservices/templates/deployment-query-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,9 @@ spec:
- configMap:
name: tempo
name: tempo-conf
{{- with .Values.queryFrontend.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
affinity:
{{- toYaml .Values.queryFrontend.affinity | nindent 8 }}
7 changes: 7 additions & 0 deletions operations/helm/tempo-microservices/templates/statefulset-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ spec:
- configMap:
name: tempo
name: tempo-conf
{{- with .Values.ingester.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
affinity:
{{- toYaml .Values.ingester.affinity | nindent 8 }}

updateStrategy:
type: RollingUpdate
volumeClaimTemplates:
Expand Down
6 changes: 6 additions & 0 deletions operations/helm/tempo-microservices/templates/statefulset-memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ spec:
labels:
name: memcached
spec:
{{- with .Values.memcached.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
nodeSelector:
{{- toYaml .Values.memcached.affinity | nindent 8 }}
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
13 changes: 12 additions & 1 deletion operations/helm/tempo-microservices/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,26 @@ distributor:
jaeger:
protocols:
thrift_http: null
tolerations: []
affinity: {}
compactor:
replicas: 1
image: grafana/tempo:latest
resources:
requests:
cpu: 250m
memory: 1Gi
tolerations: []
affinity: {}
ingester:
replicas: 3
image: grafana/tempo:latest
resources:
requests:
cpu: 1
memory: 1.5Gi
tolerations: []
affinity: {}
resources:
image: grafana/tempo:latest
resources:
Expand All @@ -48,13 +54,17 @@ queryFrontend:
requests:
cpu: 250m
memory: 500Mi
tolerations: []
affinity: {}
querier:
replicas: 1
image: grafana/tempo:latest
resources:
requests:
cpu: 250m
memory: 500Mi
tolerations: []
affinity: {}
tempoQuery:
image: grafana/tempo-query:latest
resources:
Expand All @@ -64,4 +74,5 @@ tempoQuery:
memcached:
image: memcached:1.5.17-alpine
replicas: 0

tolerations: []
nodeSelector: {}