From 85034e809072ccd5b0e5e9e356567e8159697329 Mon Sep 17 00:00:00 2001 From: chrismarino Date: Mon, 14 Mar 2016 11:28:30 -0700 Subject: [PATCH 1/5] Added Romana to the list of networking alternatives. --- docs/admin/networking.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/admin/networking.md b/docs/admin/networking.md index 12b65e2be6..814d90b7ec 100644 --- a/docs/admin/networking.md +++ b/docs/admin/networking.md @@ -177,8 +177,12 @@ network, primarily aiming at Docker integration. [Calico](https://github.com/projectcalico/calico-containers) uses BGP to enable real container IPs. +### Romana + +[Romana](https://romana.io) is an open source software defined networking (SDN) solution that lets you deploy Kubernetes without an overlay network. + ## Other reading The early design of the networking model and its rationale, and some future plans are described in more detail in the [networking design -document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/networking.md). \ No newline at end of file +document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/networking.md). From bb54f78e2a31456756fc9c6f774e59e863975f07 Mon Sep 17 00:00:00 2001 From: chrismarino Date: Mon, 14 Mar 2016 11:50:23 -0700 Subject: [PATCH 2/5] Removed. Breaks Github Pages... --- CNAME | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CNAME b/CNAME index ed60cf1824..8b13789179 100644 --- a/CNAME +++ b/CNAME @@ -1,2 +1 @@ -kubernetes.io -kubernet.es + From b9faac2e09e8be799d1c1e0663195745d12e488d Mon Sep 17 00:00:00 2001 From: chrismarino Date: Mon, 14 Mar 2016 11:55:41 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1583e70c0a..2eecb4c8ab 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Welcome! We are very pleased you want to contribute to the documentation and/or You can click the "Fork" button in the upper-right area of the screen to create a copy of our site on your GitHub account called a "fork." Make any changes you want in your fork, and when you are ready to send those changes to us, go to the index page for your fork and click "New Pull Request" to let us know about it. -If you want to see your changes staged without having to install anything locally, -change your fork of our repo to be named: +If you want to see your changes staged without having to install anything locally, remove the CNAME file in this directory and +change the name of the fork of our repo to be named: YOUR_GITHUB_USERNAME.github.io From 3c814a9629f0e040abc426cc6459333b2a96a223 Mon Sep 17 00:00:00 2001 From: chrismarino Date: Mon, 14 Mar 2016 11:59:54 -0700 Subject: [PATCH 4/5] Misc.. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eecb4c8ab..73e88cb3b4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Welcome! We are very pleased you want to contribute to the documentation and/or You can click the "Fork" button in the upper-right area of the screen to create a copy of our site on your GitHub account called a "fork." Make any changes you want in your fork, and when you are ready to send those changes to us, go to the index page for your fork and click "New Pull Request" to let us know about it. If you want to see your changes staged without having to install anything locally, remove the CNAME file in this directory and -change the name of the fork of our repo to be named: +change the name of the fork to be: YOUR_GITHUB_USERNAME.github.io From 55315a39afda2581543c1435f8df1c7e2590ac7a Mon Sep 17 00:00:00 2001 From: Chris Marino Date: Wed, 16 Mar 2016 15:02:41 -0700 Subject: [PATCH 5/5] Revert "Removed. Breaks Github Pages..." This reverts commit bb54f78e2a31456756fc9c6f774e59e863975f07. --- CNAME | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 8b13789179..ed60cf1824 100644 --- a/CNAME +++ b/CNAME @@ -1 +1,2 @@ - +kubernetes.io +kubernet.es