From fc1de42c018f5bee700f0098fe6d782ae301f82d Mon Sep 17 00:00:00 2001 From: toby cabot Date: Sun, 7 Jun 2020 17:41:39 -0400 Subject: [PATCH 1/2] Sync contact methods in README and CONTRIBUTING Now that the CNI slack has been in use for ~7 months it's no longer necessary to have it as a top-level banner headline. It should be in CONTRIBUTING.md, though, with the other project contact channels. Signed-off-by: toby cabot --- CONTRIBUTING.md | 3 ++- README.md | 16 +++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index befbe9cf..89bfbc74 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,9 +16,10 @@ contribution. See the [DCO](DCO) file for details. # Email and Chat -The project uses the cni-dev email list and IRC chat: +The project uses the cni-dev email list, IRC chat, and Slack: - Email: [cni-dev](https://groups.google.com/forum/#!forum/cni-dev) - IRC: #[containernetworking](irc://irc.freenode.net:6667/#containernetworking) channel on [freenode.net](https://freenode.net/) +- Slack: #cni on the [CNCF slack](https://slack.cncf.io/). NOTE: the previous CNI Slack (containernetworking.slack.com) has been sunsetted. Please avoid emailing maintainers found in the MAINTAINERS file directly. They are very busy and read the mailing lists. diff --git a/README.md b/README.md index 4e521f02..38fcb47e 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,6 @@ The CNI maintainers are hosting two sessions at KubeCon / CloudNativeCon 2019: - [Introduction to CNI](https://kccncna19.sched.com/event/Uaif/introduction-to-cni-the-container-network-interface-project-bryan-boreham-weaveworks-dan-williams-red-hat) - [CNI deep dive](https://kccncna19.sched.com/event/Uaga/deep-dive-cni-bryan-boreham-weaveworks-dan-williams-red-hat) ---- - -# CNI Slack - -The CNI slack has been sunsetted - please join us in #cni and #cni-dev on the [CNCF slack](https://slack.cncf.io/) - - ---- - # CNI - the Container Network Interface ## What is CNI? @@ -221,8 +212,7 @@ binary; as this is a developer tool we suggest you build it yourself. ## Contact -For any questions about CNI, please reach out on the mailing list: +For any questions about CNI, please reach out via: - Email: [cni-dev](https://groups.google.com/forum/#!forum/cni-dev) -- IRC: #[containernetworking](irc://irc.freenode.org:6667/#containernetworking) channel on freenode.org -- #cni on the [CNCF slack](https://slack.cncf.io/) - +- IRC: #[containernetworking](irc://irc.freenode.net:6667/#containernetworking) channel on [freenode.net](https://freenode.net/) +- Slack: #cni on the [CNCF slack](https://slack.cncf.io/). NOTE: the previous CNI Slack (containernetworking.slack.com) has been sunsetted. From c78d465e9f8d61658a3f91b0e3a9aef37e8f8bc4 Mon Sep 17 00:00:00 2001 From: toby cabot Date: Sun, 7 Jun 2020 18:03:05 -0400 Subject: [PATCH 2/2] Replace 2019 conference announcement with links to the recordings While KubeCon/CloudNativeCon 2019 is in the past the recordings of the sessions are helpful. Signed-off-by: toby cabot --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 38fcb47e..e70fa809 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,6 @@ --- -# CNI at KubeCon / CloudNativeCon - -The CNI maintainers are hosting two sessions at KubeCon / CloudNativeCon 2019: - -- [Introduction to CNI](https://kccncna19.sched.com/event/Uaif/introduction-to-cni-the-container-network-interface-project-bryan-boreham-weaveworks-dan-williams-red-hat) -- [CNI deep dive](https://kccncna19.sched.com/event/Uaga/deep-dive-cni-bryan-boreham-weaveworks-dan-williams-red-hat) - # CNI - the Container Network Interface ## What is CNI? @@ -26,6 +19,11 @@ As well as the [specification](SPEC.md), this repository contains the Go source The template code makes it straight-forward to create a CNI plugin for an existing container networking project. CNI also makes a good framework for creating a new container networking project from scratch. +Here are the recordings of two sessions that the CNI maintainers hosted at KubeCon/CloudNativeCon 2019: + +- [Introduction to CNI](https://youtu.be/YjjrQiJOyME) +- [CNI deep dive](https://youtu.be/zChkx-AB5Xc) + ## Why develop CNI? Application containers on Linux are a rapidly evolving area, and within this area networking is not well addressed as it is highly environment-specific.