From 81068b6d55a79d643d616e0d449cbb8c31ef8547 Mon Sep 17 00:00:00 2001 From: Paul Burt Date: Fri, 3 Mar 2017 14:07:03 -0500 Subject: [PATCH 1/4] added production users and integrations pages --- Documentation/integrations.md | 6 ++++++ Documentation/production-users.md | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 Documentation/integrations.md create mode 100644 Documentation/production-users.md diff --git a/Documentation/integrations.md b/Documentation/integrations.md new file mode 100644 index 000000000..024eb9b44 --- /dev/null +++ b/Documentation/integrations.md @@ -0,0 +1,6 @@ +# Integrations +This document tracks the libraries and tools that are compatible with flannel. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. + +## Tools + +## Projects with a flannel dependency diff --git a/Documentation/production-users.md b/Documentation/production-users.md new file mode 100644 index 000000000..7c307b375 --- /dev/null +++ b/Documentation/production-users.md @@ -0,0 +1,3 @@ +# Production users + +This document tracks people and use cases for flannel in production. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. \ No newline at end of file From 342e2729d43d65b60d39358f12e3fe4b00f415df Mon Sep 17 00:00:00 2001 From: Paul Burt Date: Fri, 3 Mar 2017 22:49:54 -0500 Subject: [PATCH 2/4] part 2 --- Documentation/integrations.md | 12 +++++++++--- Documentation/production-users.md | 6 +++++- README.md | 7 ++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Documentation/integrations.md b/Documentation/integrations.md index 024eb9b44..888698cf0 100644 --- a/Documentation/integrations.md +++ b/Documentation/integrations.md @@ -1,6 +1,12 @@ # Integrations -This document tracks the libraries and tools that are compatible with flannel. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. +This document tracks projects that integrate with flannel. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. -## Tools +## Projects -## Projects with a flannel dependency +[Kubernetes](https://kubernetes.io/docs/admin/networking/#flannel): a container orchestration platform, with options for [flannel as an overlay](https://kubernetes.io/docs/admin/networking/#flannel). + +[Tectonic](https://coreos.com/tectonic/): an enterprise ready, 100% pure distribution of Kubernetes. Made by CoreOS. + +[Canal](https://github.com/projectcalico/canal): policy based networking for cloud-native apps. + +[Container Linux](https://coreos.com/flannel/docs/latest/flannel-config.html): an auto-updating, minimal and secure Linux distribution by CoreOS. diff --git a/Documentation/production-users.md b/Documentation/production-users.md index 7c307b375..36ab6ea78 100644 --- a/Documentation/production-users.md +++ b/Documentation/production-users.md @@ -1,3 +1,7 @@ # Production users -This document tracks people and use cases for flannel in production. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. \ No newline at end of file +This document tracks people and use cases for flannel in production. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. + +## [Coreos.com](https://coreos.com/) + +Relies on Tectonic (which includes flannel) to host the CoreOS marketing site. \ No newline at end of file diff --git a/README.md b/README.md index c72572028..78eb07423 100644 --- a/README.md +++ b/README.md @@ -225,10 +225,15 @@ To work around this issue, use `--iface` option to specify the interface that ha If you're running on CoreOS, use cloud-config to set `coreos.flannel.interface` to `$public_ipv4`. -# Release Process +## Release Process * Create a release on Github and use it to create a tag * Check the tag out and run * `make release` * Attach all the files in `dist` to the Github release * Run `make docker-push-all` to push all the images to a registry +## Related Links + +### Integrations and Production Users +- [Projects integrating with flannel](https://github.com/coreos/flannel/blob/master/Documentation/integrations.md) +- [Production users](https://github.com/coreos/flannel/blob/master/Documentation/production-users.md) From 63ea51959bfa4fc6d2e25b8f80ad7fe27d5eaa57 Mon Sep 17 00:00:00 2001 From: Josh Wood Date: Mon, 13 Mar 2017 22:00:18 -0700 Subject: [PATCH 3/4] integrations: Polish --- Documentation/integrations.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/integrations.md b/Documentation/integrations.md index 888698cf0..496a17484 100644 --- a/Documentation/integrations.md +++ b/Documentation/integrations.md @@ -1,12 +1,13 @@ # Integrations -This document tracks projects that integrate with flannel. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. + +This document tracks projects that integrate with flannel. [Join the community](https://github.com/coreos/flannel/) and help us keep the list current. ## Projects -[Kubernetes](https://kubernetes.io/docs/admin/networking/#flannel): a container orchestration platform, with options for [flannel as an overlay](https://kubernetes.io/docs/admin/networking/#flannel). +[Kubernetes](https://kubernetes.io/docs/admin/networking/#flannel): Container orchestration platform with options for [flannel as an overlay](https://kubernetes.io/docs/admin/networking/#flannel). -[Tectonic](https://coreos.com/tectonic/): an enterprise ready, 100% pure distribution of Kubernetes. Made by CoreOS. +[Tectonic](https://coreos.com/tectonic/): CoreOS's enterprise ready, 100% pure-upstream distribution of Kubernetes. -[Canal](https://github.com/projectcalico/canal): policy based networking for cloud-native apps. +[Canal](https://github.com/projectcalico/canal): Policy-based networking for cloud-native apps. -[Container Linux](https://coreos.com/flannel/docs/latest/flannel-config.html): an auto-updating, minimal and secure Linux distribution by CoreOS. +[Container Linux](https://coreos.com/flannel/docs/latest/flannel-config.html): Auto-updating, minimal, and secure Linux distribution by CoreOS. From 8a74ede2f1d2ade29228ea85cdfaf30f18e03fe8 Mon Sep 17 00:00:00 2001 From: Josh Wood Date: Mon, 13 Mar 2017 22:01:20 -0700 Subject: [PATCH 4/4] production-users: Polish --- Documentation/production-users.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/production-users.md b/Documentation/production-users.md index 36ab6ea78..1bd9819eb 100644 --- a/Documentation/production-users.md +++ b/Documentation/production-users.md @@ -1,7 +1,7 @@ # Production users -This document tracks people and use cases for flannel in production. [Join the community](https://github.com/coreos/flannel/), and help us keep the list up-to-date. +This document tracks people and use cases for flannel in production. [Join the community](https://github.com/coreos/flannel/) and help us keep the list current. ## [Coreos.com](https://coreos.com/) -Relies on Tectonic (which includes flannel) to host the CoreOS marketing site. \ No newline at end of file +Relies on Tectonic (which includes flannel) to host CoreOS web properties.