Allow to use custom "canalized" calico cni

- Allow to overwrite calico cni binaries copied from hyperkube
  by the custom ones.
- Fix calico-ipam deployment (it had wrong source in rsync)
- Make copy from hyperkube idempotent (use rsync instead of cp)
- Remove some orphaned comments
This commit is contained in:
Aleksandr Didenko
2016-09-22 17:34:11 +02:00
parent 948d1d61ff
commit 2b6866484e
2 changed files with 14 additions and 13 deletions

View File

@@ -5,5 +5,6 @@ nat_outgoing: true
# Use IP-over-IP encapsulation across hosts
ipip: false
# cloud_provider can only be set to 'gce' or 'aws'
# cloud_provider:
# Set to true if you want your calico cni binaries to overwrite the
# ones from hyperkube while leaving other cni plugins intact.
overwrite_hyperkube_cni: false