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

Conversation

dng-dev
Copy link

@dng-dev dng-dev commented Jul 8, 2018

changed tolerations for calico-node and calico-typha to be sure it gets deployed also to nodes with custom taints like NoExecute and NoSchedule

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

changed tolerations for calico-node and calico-typha to be sure it gets deployed also to nodes with custom taints like NoExecute and NoSchedule
changed tolerations for aws-node to be sure it gets deployed also to nodes with custom taints like NoExecute and NoSchedule
@dng-dev dng-dev changed the title Make sure calico/node gets scheduled on all nodes. Make sure calico aws-node gets scheduled on all nodes. Jul 8, 2018
@vsiddharth vsiddharth added this to the v1.1 milestone Jul 10, 2018
@@ -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?

Copy link
Contributor

@nckturner nckturner left a comment

Choose a reason for hiding this comment

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

LGTM.

@discordianfish
Copy link

LGTM (fwiw)

@nckturner
Copy link
Contributor

@dng-dev can you rebase?

@liwenwu-amazon liwenwu-amazon merged commit 6737c8b into aws:master Jul 16, 2018
liwenwu-amazon pushed a commit to liwenwu-amazon/amazon-vpc-cni-k8s-1 that referenced this pull request Jul 17, 2018
Make sure calico  aws-node gets scheduled on all nodes.
@stevenpall
Copy link

I was just wondering if this will be pulled into kops? I spent a good amount of time trying to figure out why networking was not coming up correctly on a node group with a taint. Had to manually modify the aws-node daemonset to tolerate said taint, but I like the above solution better.

@cjbottaro
Copy link

And how do I use this with EKS? I spent 2 days figuring out that adding a NoExecute taint on a node killed the networking container. Frustrating.

@liwenwu-amazon
Copy link
Contributor

@cjbottaro , v1.1.0 should fix this. How old is your eks cluster? All EKS clusters created after Jul26 should have v1.1.0. Can you show me the output of kubectl get ds aws-node -n kube-system -o yaml ?

@cjbottaro
Copy link

Definitely created before Jul26.

Please tell me there is a way to upgrade this besides recreating my EKS cluster... :/

Running that command definitely shows:

image: 602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:1.0.0

I guess I can kubectl edit -n kube-system ds aws-node and change the image. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants