From 412aab302a23bd748ad41eb5ddcc8d4cdcda7e2c Mon Sep 17 00:00:00 2001 From: Yves Junqueira Date: Fri, 19 Sep 2014 00:07:51 +0200 Subject: [PATCH 1/2] Fix typo in cluster/local/config-default.sh --- cluster/local/config-default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/local/config-default.sh b/cluster/local/config-default.sh index 2ac92054001..d81f7c2e661 100644 --- a/cluster/local/config-default.sh +++ b/cluster/local/config-default.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -## Contains configuration values for interacting with the Vagrant cluster +## Contains configuration values for interacting with a Local cluster # NUMBER OF MINIONS IN THE CLUSTER NUM_MINIONS=1 From aab58c80330b20b19b6a8ad251c6122b125d772e Mon Sep 17 00:00:00 2001 From: Yves Junqueira Date: Fri, 19 Sep 2014 00:35:08 +0200 Subject: [PATCH 2/2] Rudder has been renamed to Flannel. Update doc references. See: https://github.com/coreos/flannel/commit/81dac464965382d09dd82e7160b5858d8934bacf --- docs/networking.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/networking.md b/docs/networking.md index 8f24a0fb79b..8753c1d9cf3 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -66,7 +66,7 @@ Docker allocates IP addresses from a bridge we create on each node, using its ### Other networking implementation examples With the primary aim of providing IP-per-pod-model, other implementations exist to serve the purpose outside of GCE. - [OpenVSwitch with GRE/VxLAN](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/ovs-networking.md) - - [Rudder](https://github.com/coreos/rudder#rudder) + - [Flannel](https://github.com/coreos/flannel#flannel) ## Challenges and future work