Fix flannel error on starting

[mikesplain]

Fixes an issue where flannel does not startup due to limited resources:

kube-system   21m        21m         4         kube-flannel-ds                                       DaemonSet                                               Warning   FailedPlacement           daemonset-controller                      failed to place pod on "ip-10-25-40-53.ec2.internal": Node didn't have enough resource: cpu, requested: 104857600000, used: 0, capacity: 2000

[justinsb]

/lgtm

[k8s-github-robot]

/lgtm cancel //PR changed after LGTM, removing LGTM. @justinsb @mikesplain

[mikesplain]

Also @justinsb requested we add back -kops.1 to flannel in bootstrapchannelbuilder.

[justinsb]

/lgtm

Thanks for cleaning up after me @mikesplain

And yes, we need <upstream>-kops.1 so that we can do more kops-specific fixes, without introducing a fake upstream version number...

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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.