Skip to content

Commit

Permalink
Merge pull request #460 from timyinshi/windowcontainer-new
Browse files Browse the repository at this point in the history
modify the error url of windowscontainer
  • Loading branch information
bboreham authored Apr 29, 2020
2 parents 6957f6c + ca41907 commit f7a2fc9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugins/meta/flannel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Additionally, for the bridge plugin, `isGateway` will be set to `true`, if not p

## Windows Support (Experimental)
This plugin supports delegating to the windows CNI plugins (overlay.exe, l2bridge.exe) to work in conjunction with [Flannel on Windows](https://github.com/coreos/flannel/issues/833).
Flannel sets up an [HNS Network](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking) in L2Bridge mode for host-gw and in Overlay mode for vxlan.
Flannel sets up an [HNS Network](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture) in L2Bridge mode for host-gw and in Overlay mode for vxlan.

The following fields must be set in the delegated plugin configuration:
* `name` (string, required): the name of the network (must match the name in Flannel config / name of the HNS network)
Expand Down Expand Up @@ -132,4 +132,4 @@ For this example, Flannel CNI would generate the following config to delegate to
"type": "host-local"
}
}
```
```

0 comments on commit f7a2fc9

Please sign in to comment.