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

Bug 1780318: MCD: tolerate all taints #1760

Merged
merged 1 commit into from Jun 4, 2020
Merged

Bug 1780318: MCD: tolerate all taints #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions manifests/machineconfigdaemon/daemonset.yaml
View file
Open in desktop
Expand Up @@ -63,13 +63,6 @@ spec:
hostPID: true
serviceAccountName: machine-config-daemon
terminationGracePeriodSeconds: 600
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/etcd
operator: Exists
effect: NoSchedule
nodeSelector:
kubernetes.io/os: linux
priorityClassName: "system-node-critical"
Expand All @@ -83,3 +76,6 @@ spec:
- name: cookie-secret
secret:
secretName: cookie-secret
tolerations:
# MCD needs to run everywhere. Tolerate all taints.
- operator: Exists
11 changes: 3 additions & 8 deletions pkg/operator/assets/bindata.go
View file
Open in desktop
Expand Up @@ -1288,13 +1288,6 @@ spec:
hostPID: true
serviceAccountName: machine-config-daemon
terminationGracePeriodSeconds: 600
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/etcd
operator: Exists
effect: NoSchedule
nodeSelector:
kubernetes.io/os: linux
priorityClassName: "system-node-critical"
Expand All @@ -1308,7 +1301,9 @@ spec:
- name: cookie-secret
secret:
secretName: cookie-secret
`)
tolerations:
# MCD needs to run everywhere. Tolerate all taints.
- operator: Exists`)

func manifestsMachineconfigdaemonDaemonsetYamlBytes() ([]byte, error) {
return _manifestsMachineconfigdaemonDaemonsetYaml, nil
Expand Down