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

Adding tolerations and affinity to the discovery chart template (#1959) #1967

Merged
merged 4 commits into from
Mar 20, 2020
Merged

Adding tolerations and affinity to the discovery chart template (#1959) #1967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
065eab8
Adding tolerations and affinity to the discovery chart template
Mar 17, 2020
73eaec8
Merge branch 'release-1.1' into release-1.1-4b828272a7b1
Yisaer Mar 18, 2020
4bbbdbc
Merge branch 'release-1.1' into release-1.1-4b828272a7b1
Yisaer Mar 19, 2020
4aa9967
Merge branch 'release-1.1' into release-1.1-4b828272a7b1
Yisaer Mar 19, 2020
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: 8 additions & 0 deletions charts/tidb-cluster/templates/discovery-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ spec:
{{- if .Values.rbac.create }}
serviceAccount: {{ template "cluster.name" . }}-discovery
{{- end }}
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.affinity | indent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
{{- end }}
containers:
- name: discovery
Expand Down
9 changes: 9 additions & 0 deletions charts/tidb-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ discovery:
cpu: 80m
memory: 50Mi

## affinity defines discovery scheduling rules,it's default settings is empty.
## please read the affinity document before set your scheduling rule:
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
affinity: {}

## Tolerations are applied to pods, and allow pods to schedule onto nodes with matching taints.
## refer to https://kubernetes.io/docs/concepts/configuration/taint-and-toleration
tolerations: []

# Whether enable ConfigMap Rollout management.
# When enabling, change of ConfigMap will trigger a graceful rolling-update of the component.
# This feature is only available in tidb-operator v1.0 or higher.
Expand Down