From 8ed888a76535c674730ec6e8fb1c7aa71e6e0393 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Tue, 27 Feb 2018 13:56:46 -0500 Subject: [PATCH] Updated to reflect network offerings (#7530) Juju now supports canal and flannel. Adding docs to indicate that. --- .../ubuntu/networking.md | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/docs/getting-started-guides/ubuntu/networking.md b/docs/getting-started-guides/ubuntu/networking.md index 5b5d84e16e..d797720b90 100644 --- a/docs/getting-started-guides/ubuntu/networking.md +++ b/docs/getting-started-guides/ubuntu/networking.md @@ -5,34 +5,43 @@ title: Networking {% capture overview %} Kubernetes supports the [Container Network Interface (CNI)](https://github.com/containernetworking/cni). This is a network plugin architecture that allows you to use whatever -Kubernetes-friendly SDN you want. Currently this means support for Flannel. +Kubernetes-friendly SDN you want. Currently this means support for Flannel and Canal. -This page shows how to the various network portions of a cluster work, and how to configure them. +This page shows how the various network portions of a cluster work and how to configure them. {% endcapture %} {% capture prerequisites %} This page assumes you have a working Juju deployed cluster. + +**Note:** Note that if you deploy a cluster via conjure-up or the CDK bundles, manually deploying CNI plugins is unnecessary. +{: .note} {% endcapture %} {% capture steps %} -## Flannel +The CNI charms are [subordinates](https://jujucharms.com/docs/stable/authors-subordinate-applications). +These charms will require a principal charm that implements the `kubernetes-cni` interface in order to properly deploy. -The flannel charm is a -[subordinate](https://jujucharms.com/docs/stable/authors-subordinate-applications). -This charm will require a principal charm that implements the `kubernetes-cni` -interface in order to properly deploy. +## Flannel ``` juju deploy flannel -juju deploy etcd -juju deploy kubernetes-master juju add-relation flannel kubernetes-master +juju add-relation flannel kubernetes-worker juju add-relation flannel etcd ``` +## Canal + +``` +juju deploy canal +juju add-relation canal kubernetes-master +juju add-relation canal kubernetes-worker +juju add-relation canal etcd +``` + ### Configuration -**iface** The interface to configure the flannel SDN binding. If this value is +**iface** The interface to configure the flannel or canal SDN binding. If this value is empty string or undefined the code will attempt to find the default network adapter similar to the following command: @@ -40,7 +49,7 @@ adapter similar to the following command: $ route | grep default | head -n 1 | awk {'print $8'} ``` -**cidr** The network range to configure the flannel SDN to declare when +**cidr** The network range to configure the flannel or canal SDN to declare when establishing networking setup with etcd. Ensure this network range is not active on layers 2/3 you're deploying to, as it will cause collisions and odd behavior if care is not taken when selecting a good CIDR range to assign to flannel. It's