Merge pull request #589 from coreos/tomdee-patch-1

Add note to readme about -kube-subnet-mgr
flannel-io · Jan 10, 2017 · d9560b0 · d9560b0
2 parents fca3c8b + bce6d4e
commit d9560b0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -179,6 +179,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green
 --etcd-keyfile="": SSL key file used to secure etcd communication.
 --etcd-certfile="": SSL certification file used to secure etcd communication.
 --etcd-cafile="": SSL Certificate Authority file used to secure etcd communication.
+--kube-subnet-mgr: Contact the Kubernetes API for subnet assignement instead of etcd or flannel-server.
 --iface="": interface to use (IP or name) for inter-host communication. Defaults to the interface for the default route on the machine.
 --subnet-file=/run/flannel/subnet.env: filename where env variables (subnet and MTU values) will be written to.
 --subnet-lease-renew-margin=60: subnet lease renewal margin, in minutes.