From c6e8f54fe7f0b887c7c94e48cc7cb5e6339dc1cd Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 11 Apr 2016 11:31:25 +0100 Subject: [PATCH] Add CNI plugin to description --- plugin/README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugin/README.md b/plugin/README.md index 1e246c1c..0818ee9e 100644 --- a/plugin/README.md +++ b/plugin/README.md @@ -1,9 +1,14 @@ -# Weave network driver extension for Docker +# Weave network driver extension for Docker and Kubernetes -A [plugin](http://docs.docker.com/engine/extend/plugin_api/) to -integrate [weave Net](http://weave.works/net/) with Docker. +This directory implements both a +[Docker plugin](http://docs.docker.com/engine/extend/plugin_api/) to +integrate [Weave Net](http://weave.works/net/) with Docker, and a +[Container Network Interface (CNI) plugin](https://github.com/appc/cni#cni---the-container-network-interface), +to integrate Weave Net with [Kubernetes](http://kubernetes.io/). -The plugin runs automatically when you `weave launch`, provided your +The Docker plugin runs automatically when you `weave launch`, provided your Docker daemon is version 1.9 or newer. -More detail [here](http://docs.weave.works/weave/latest_release/plugin.html). +More detail on the Docker plugin [here](http://docs.weave.works/weave/latest_release/plugin.html). + +More detail on the CNI plugin [here](https://github.com/weaveworks/weave/blob/master/site/plugin/cni-plugin-how-to.md).