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.

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

Make sure calico aws-node gets scheduled on all nodes. #128

Merged
merged 2 commits into from
Jul 16, 2018
Merged
Changes from 1 commit
Commits
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
11 changes: 2 additions & 9 deletions config/v1.0/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,7 @@ spec:
path: /var/run/calico
tolerations:
# Make sure calico/node gets scheduled on all nodes.
- effect: NoSchedule
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@caseydavenport I don't think this is needed for calico policy

Copy link
Contributor

@nckturner nckturner Jul 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liwenwu-amazon If the aws CNI is going to tolerate everything, shouldn't the calico policy do the same?

operator: Exists
- effect: NoExecute
operator: Exists
# Mark the pod as a critical add-on for rescheduling.
- key: CriticalAddonsOnly
operator: Exists
- operator: Exists

---

Expand Down Expand Up @@ -375,8 +369,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- operator: Exists
hostNetwork: true
serviceAccountName: calico-node
containers:
Expand Down