Преглед на файлове

Clarify where the config is read from when using --kube-subnet-mgr, e.g. when using the provided Kubernetes manifest.

Nick Cabatoff преди 6 години
родител
ревизия
6c9ebf5065
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      Documentation/configuration.md

+ 2 - 1
Documentation/configuration.md

@@ -1,7 +1,8 @@
 # Configuration
 
-flannel reads its configuration from etcd.
+If the --kube-subnet-mgr argument is true, flannel reads its configuration from `/etc/kube-flannel/net-conf.json`.
 
+If the --kube-subnet-mgr argument is false, flannel reads its configuration from etcd.
 By default, it will read the configuration from `/coreos.com/network/config` (which can be overridden using `--etcd-prefix`).
 
 Use the `etcdctl` utility to set values in etcd.