diff --git a/OWNERS.md b/OWNERS.md index b3af0176..b5d053fa 100644 --- a/OWNERS.md +++ b/OWNERS.md @@ -2,9 +2,9 @@ This is the official list of the CNI network plugins owners: - Bruce Ma (@mars1024) - Bryan Boreham (@bboreham) -- Casey Callendrello (@squeed) +- Casey Callendrello (@squeed) - Dan Williams (@dcbw) - Gabe Rosenhouse (@rosenhouse) - Matt Dupre (@matthewdupre) +- Michael Cambria (@mccv1r0) - Piotr Skarmuk (@jellonek) -- Stefan Junker (@steveeJ) \ No newline at end of file diff --git a/plugins/meta/flannel/README.md b/plugins/meta/flannel/README.md index da7961b9..326c7d58 100644 --- a/plugins/meta/flannel/README.md +++ b/plugins/meta/flannel/README.md @@ -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) @@ -132,4 +132,4 @@ For this example, Flannel CNI would generate the following config to delegate to "type": "host-local" } } -``` \ No newline at end of file +```