Fix for Canal Taints and Tolerations

[prachetasp]

This PR fixes issues with taints and tolerations for the Canal network type.

There are 2 problems:

1. Canal pods will not schedule onto dedicated instancegroups due to their too-strict tolerations. A similar fix for calico was merged recently added wider toleration to calico-node daemonset (#2857) #3097 - this is the same fix for Canal instead.
2. When booting a cluster with 1.7.0 we ran into the same issue mentioned in Kubernetes master node is 'untainted' when applying Canal CNI projectcalico/canal#77 and likely experienced in Masters created with no Taints #2856. Specifically one of our dedicated instancegroups and the master nodes had no Taints attached. To mitigate we simply bump the versions of calico/node and calico/cni to match the versions that resolved Kubernetes master node is 'untainted' when applying Canal CNI projectcalico/canal#77.

When using these fixes to boot our k8s 1.7.3 cluster with this branch the Taints showed up and Calico scheduled on our masters and our dedicated IG.

I am not sure if there are associated tests that need to be updated here - still not familiar enough with the kops repo to tell.

[k8s-ci-robot]

Hi @prachetasp. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[prachetasp]

/assign @justinsb

[justinsb]

/ok-to-test

This is good, but in order to get this to be applied to existing clusters, you also need to update the version of the manifest here: https://github.com/kubernetes/kops/blob/master/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go#L416

Anything "higher" than the existing should work, if the calico version is 1.3.0 we should probably use that value, for sanity!

[prachetasp]

Bumped the Canal manifest addon version as suggested. Thanks for pointing that out!

[justinsb]

/lgtm

Thanks @prachetasp

[k8s-github-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, prachetasp

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

• OWNERS [justinsb]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

[k8s-github-robot]

/test all [submit-queue is verifying that this PR is safe to merge]

[k8s-github-robot]

Automatic merge from submit-queue