github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Docs etc

pull/6/head
Prashanth Balasubramanian 2015-11-22 16:06:04 -08:00 committed by gmarek
parent 321bc73264
commit ad2d3d4c20
12 changed files with 177 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/config-default.sh
View File

@ -120,4 +120,3 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
# Optional: if set to true, kube-up will configure the cluster to run e2e tests. # Optional: if set to true, kube-up will configure the cluster to run e2e tests.
E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
FIREWALL_ETCD="${FIREWALL_SSH:-${NETWORK}-allow-etcd}"

1
cluster/gce/config-test.sh
View File

@ -134,4 +134,3 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
# Overlay network settings # Overlay network settings
OVERLAY_NETWORK=${OVERLAY_NETWORK:-true} OVERLAY_NETWORK=${OVERLAY_NETWORK:-true}
FIREWALL_ETCD="${FIREWALL_SSH:-${NETWORK}-allow-etcd}"

17
cluster/gce/util.sh
View File

@ -603,28 +603,13 @@ function kube-up {
--allow "tcp:22" & --allow "tcp:22" &
fi fi
echo "Starting master and configuring firewalls"
gcloud compute firewall-rules create "${MASTER_NAME}-https" \ gcloud compute firewall-rules create "${MASTER_NAME}-https" \
--project "${PROJECT}" \ --project "${PROJECT}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
--target-tags "${MASTER_TAG}" \ --target-tags "${MASTER_TAG}" \
--allow tcp:443 & --allow tcp:443 &
if [[ "${OVERLAY_NETWORK}" == "true" ]]; then
# TODO: Where to put this? Scope it to flannel setup.
if ! "${GCLOUD}" compute firewall-rules --project "${PROJECT}" describe "${FIREWALL_ETCD}" &>/dev/null; then
"${GCLOUD}" compute firewall-rules create "${FIREWALL_ETCD}" \
--network="${NETWORK}" \
--project="${PROJECT}" \
--source-ranges="10.0.0.0/8" \
--target-tags "${MINION_TAG}" \
--allow tcp:4001 &
else
echo "... Using etcd firewall-rule: ${FIREWALL_ETCD}" >&2
fi
else
echo "Not opening etcd up to the cluster: ${OVERLAY_NETWORK} ${FIREWALL_ETCD}"
fi
# We have to make sure the disk is created before creating the master VM, so # We have to make sure the disk is created before creating the master VM, so
# run this in the foreground. # run this in the foreground.
gcloud compute disks create "${MASTER_NAME}-pd" \ gcloud compute disks create "${MASTER_NAME}-pd" \

2
cluster/saltbase/salt/flannel-server/init.sls
View File

@ -8,7 +8,7 @@ touch /var/log/etcd_flannel.log:
/etc/kubernetes/network.json: /etc/kubernetes/network.json:
file.managed: file.managed:
- source: salt://flannel/network.json - source: salt://flannel-server/network.json
- makedirs: True - makedirs: True
- user: root - user: root
- group: root - group: root

8
cluster/saltbase/salt/flannel/network.json
View File

@ -1,8 +0,0 @@
{
"Network": "18.16.0.0/16",
"SubnetLen": 24,
"Backend": {
"Type": "vxlan",
"VNI": 1
}
}

3
cluster/saltbase/salt/top.sls
View File

@ -14,9 +14,6 @@ base:
- match: grain - match: grain
- docker - docker
- flannel - flannel
{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
- openvpn-client
{% endif %}
- helpers - helpers
- cadvisor - cadvisor
- kube-client-tools - kube-client-tools

10
cmd/kubelet/app/server.go
View File

@ -159,10 +159,7 @@ type KubeletServer struct {
// Pull images one at a time. // Pull images one at a time.
SerializeImagePulls bool SerializeImagePulls bool
// Flannel config parameters
UseDefaultOverlay bool UseDefaultOverlay bool
NetworkConfig string
} }
// bootstrapping interface for kubelet, targets the initialization protocol // bootstrapping interface for kubelet, targets the initialization protocol
@ -237,7 +234,6 @@ func NewKubeletServer() *KubeletServer {
KubeAPIBurst: 10, KubeAPIBurst: 10,
// Flannel parameters // Flannel parameters
UseDefaultOverlay: useDefaultOverlay, UseDefaultOverlay: useDefaultOverlay,
// NetworkConfig: networkConfig,
} }
} }
@ -355,7 +351,6 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) {
// Flannel config parameters // Flannel config parameters
fs.BoolVar(&s.UseDefaultOverlay, "use-default-overlay", s.UseDefaultOverlay, "Experimental support for starting the kubelet with the default overlay network (flannel). Assumes flanneld is already running in client mode. [default=false]") fs.BoolVar(&s.UseDefaultOverlay, "use-default-overlay", s.UseDefaultOverlay, "Experimental support for starting the kubelet with the default overlay network (flannel). Assumes flanneld is already running in client mode. [default=false]")
fs.StringVar(&s.NetworkConfig, "network-config", s.NetworkConfig, "Absolute path to a network json file, as accepted by flannel.")
} }
// UnsecuredKubeletConfig returns a KubeletConfig suitable for being run, or an error if the server setup // UnsecuredKubeletConfig returns a KubeletConfig suitable for being run, or an error if the server setup
@ -494,9 +489,7 @@ func (s *KubeletServer) UnsecuredKubeletConfig() (*KubeletConfig, error) {
Writer: writer, Writer: writer,
VolumePlugins: ProbeVolumePlugins(), VolumePlugins: ProbeVolumePlugins(),
// Flannel options
UseDefaultOverlay: s.UseDefaultOverlay, UseDefaultOverlay: s.UseDefaultOverlay,
NetworkConfig: s.NetworkConfig,
}, nil }, nil
} }
@ -969,9 +962,7 @@ type KubeletConfig struct {
Writer io.Writer Writer io.Writer
VolumePlugins []volume.VolumePlugin VolumePlugins []volume.VolumePlugin
// Flannel parameters
UseDefaultOverlay bool UseDefaultOverlay bool
NetworkConfig string
} }
func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.PodConfig, err error) { func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.PodConfig, err error) {
@ -1056,7 +1047,6 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
kc.ContainerManager, kc.ContainerManager,
// Flannel parameters // Flannel parameters
kc.UseDefaultOverlay, kc.UseDefaultOverlay,
//kc.NetworkConfig,
) )
if err != nil { if err != nil {

3
docs/admin/kubelet.md
View File

@ -137,9 +137,10 @@ kubelet
--system-container="": Optional resource-only container in which to place all non-kernel processes that are not already in a container. Empty for no container. Rolling back the flag requires a reboot. (Default: ""). --system-container="": Optional resource-only container in which to place all non-kernel processes that are not already in a container. Empty for no container. Rolling back the flag requires a reboot. (Default: "").
--tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir. --tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir.
--tls-private-key-file="": File containing x509 private key matching --tls-cert-file. --tls-private-key-file="": File containing x509 private key matching --tls-cert-file.
--use-default-overlay[=true]: Experimental support for starting the kubelet with the default overlay network (flannel). Assumes flanneld is already running in client mode. [default=false]
``` ```
###### Auto generated by spf13/cobra on 21-Nov-2015 ###### Auto generated by spf13/cobra on 23-Nov-2015
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

164
docs/proposals/flannel-integration.md
View File

@ -1,35 +1,165 @@
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- BEGIN STRIP_FOR_RELEASE -->
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
If you are using a released version of Kubernetes, you should
refer to the docs that go with that version.
<strong>
The latest release of this document can be found
[here](http://releases.k8s.io/release-1.1/docs/proposals/flannel-integration.md).
Documentation for other releases can be found at
[releases.k8s.io](http://releases.k8s.io).
</strong>
--
<!-- END STRIP_FOR_RELEASE -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Flannel integration with Kubernetes # Flannel integration with Kubernetes
## Why? ## Why?
* Networking works out of the box. * Networking works out of the box.
* Cloud gateway configuration is regulated. * Cloud gateway configuration is regulated by quota.
* Consistent bare metal and cloud experience. * Consistent bare metal and cloud experience.
* Lays foundation for integrating with networking backends and vendors. * Lays foundation for integrating with networking backends and vendors.
# How? ## How?
Thus:
``` ```
Master Node1 Master | Node1
---------------------|-------------------------------- ----------------------------------------------------------------------
database | {192.168.0.0/16, 256 /24} | docker
| | | | | restart with podcidr
{10.250.0.0/16} | docker apiserver <------------------ kubelet (sends podcidr)
| here's podcidr |restart with podcidr | | | here's podcidr, mtu
apiserver <------------------- kubelet flannel-server:10253 <------------------ flannel-daemon
| | |here's podcidr Allocates a /24 ------------------> [config iptables, VXLan]
flannel-server:10253 <------- flannel-daemon <------------------ [watch subnet leases]
--/16---> I just allocated ------------------> [config VXLan]
<--watch-- [config iptables] another /24 |
subscribe to new node subnets
--------> [config VXLan]
|
``` ```
There is a tiny lie in the above diagram, as of now, the flannel server on the master maintains a private etcd. This will not be necessary once we have a generalized network resource, and a Kubernetes x flannel backend. ## Proposal
Explaining vxlan is out of the scope of this document, however it does take some basic understanding to grok the proposal. Assume some pod wants to communicate across nodes with the above setup. Check the flannel vxlan devices:
```console
node1 $ ip -d link show flannel.1
4: flannel.1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1410 qdisc noqueue state UNKNOWN mode DEFAULT
link/ether a2:53:86:b5:5f:c1 brd ff:ff:ff:ff:ff:ff
vxlan
node1 $ ip -d link show eth0
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1460 qdisc mq state UP mode DEFAULT qlen 1000
link/ether 42:01:0a:f0:00:04 brd ff:ff:ff:ff:ff:ff
node2 $ ip -d link show flannel.1
4: flannel.1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1410 qdisc noqueue state UNKNOWN mode DEFAULT
link/ether 56:71:35:66:4a:d8 brd ff:ff:ff:ff:ff:ff
vxlan
node2 $ ip -d link show eth0
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1460 qdisc mq state UP mode DEFAULT qlen 1000
link/ether 42:01:0a:f0:00:03 brd ff:ff:ff:ff:ff:ff
```
Note that we're ignoring cbr0 for the sake of simplicity. Spin-up a container on each node. We're using raw docker for this example only because we want control over where the container lands:
```
node1 $ docker run -it radial/busyboxplus:curl /bin/sh
[ root@5ca3c154cde3:/ ]$ ip addr show
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue
8: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1410 qdisc noqueue
link/ether 02:42:12:10:20:03 brd ff:ff:ff:ff:ff:ff
inet 192.168.32.3/24 scope global eth0
valid_lft forever preferred_lft forever
node2 $ docker run -it radial/busyboxplus:curl /bin/sh
[ root@d8a879a29f5d:/ ]$ ip addr show
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue
16: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1410 qdisc noqueue
link/ether 02:42:12:10:0e:07 brd ff:ff:ff:ff:ff:ff
inet 192.168.14.7/24 scope global eth0
valid_lft forever preferred_lft forever
[ root@d8a879a29f5d:/ ]$ ping 192.168.32.3
PING 192.168.32.3 (192.168.32.3): 56 data bytes
64 bytes from 192.168.32.3: seq=0 ttl=62 time=1.190 ms
```
__What happened?__:
From 1000 feet:
* vxlan device driver starts up on node1 and creates a udp tunnel endpoint on 8472
* container 192.168.32.3 pings 192.168.14.7
- what's the MAC of 192.168.14.0?
- L2 miss, flannel looks up MAC of subnet
- Stores `192.168.14.0 <-> 56:71:35:66:4a:d8` in neighbor table
- what's tunnel endpoint of this MAC?
- L3 miss, flannel looks up destination VM ip
- Stores `10.240.0.3 <-> 56:71:35:66:4a:d8` in bridge database
* Sends `[56:71:35:66:4a:d8, 10.240.0.3][vxlan: port, vni][02:42:12:10:20:03, 192.168.14.7][icmp]`
__But will it blend?__
Kubernetes integration is fairly straight-forward once we understand the pieces involved, and can be prioritized as follows:
* Kubelet understands flannel daemon in client mode, flannel server manages independent etcd store on master, node controller backs off cidr allocation
* Flannel server consults the Kubernetes master for everything network related
* Flannel daemon works through network plugins in a generic way without bothering the kubelet: needs CNI x Kubernetes standardization
The first is accomplished in this PR, while a timeline for 2. and 3. are TDB. To implement the flannel api we can either run a proxy per node and get rid of the flannel server, or service all requests in the flannel server with something like a go-routine per node:
* `/network/config`: read network configuration and return
* `/network/leases`:
- Post: Return a lease as understood by flannel
- Lookip node by IP
- Store node metadata from [flannel request] (https://github.com/coreos/flannel/blob/master/subnet/subnet.go#L34) in annotations
- Return [Lease object] (https://github.com/coreos/flannel/blob/master/subnet/subnet.go#L40) reflecting node cidr
- Get: Handle a watch on leases
* `/network/leases/subnet`:
- Put: This is a request for a lease. If the nodecontroller is allocating CIDRs we can probably just no-op.
* `/network/reservations`: TDB, we can probably use this to accomodate node controller allocating CIDR instead of flannel requesting it
The ick-iest part of this implementation is going to the the `GET /network/leases`, i.e the watch proxy. We can side-step by waiting for a more generic Kubernetes resource. However, we can also implement it as follows:
* Watch all nodes, ignore heartbeats
* On each change, figure out the lease for the node, construct a [lease watch result](https://github.com/coreos/flannel/blob/0bf263826eab1707be5262703a8092c7d15e0be4/subnet/subnet.go#L72), and send it down the watch with the RV from the node
* Implement a lease list that does a similar translation
I say this is gross without an api objet because for each node->lease translation one has to store and retrieve the node metadata sent by flannel (eg: VTEP) from node annotations. [Reference implementation](https://github.com/bprashanth/kubernetes/blob/network_vxlan/pkg/kubelet/flannel_server.go) and [watch proxy](https://github.com/bprashanth/kubernetes/blob/network_vxlan/pkg/kubelet/watch_proxy.go).
# Limitations # Limitations
* Integration is experimental * Integration is experimental
* Flannel etcd not stored in persistent disk
* CIDR allocation does *not* flow from Kubernetes down to nodes anymore
# Wishlist # Wishlist
This proposal is really just a call for community help in writing a Kubernetes x flannel backend.
* CNI plugin integration
* Flannel daemon in privileged pod
* Flannel server talks to apiserver, described in proposal above
* HTTPs between flannel daemon/server
* Investigate flannel server runing on every node (as done in the reference implementation mentioned above)
* Use flannel reservation mode to support node controller podcidr alloction
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/flannel-integration.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->

1
hack/verify-flags/known-flags.txt
View File

@ -327,3 +327,4 @@ watch-only
whitelist-override-label whitelist-override-label
windows-line-endings windows-line-endings
www-prefix www-prefix
use-default-overlay

16
pkg/kubelet/flannel_server.go → pkg/kubelet/flannel_helper.go
View File

@ -1,3 +1,19 @@
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package kubelet package kubelet
import ( import (

14
pkg/kubelet/kubelet.go
View File

@ -328,9 +328,6 @@ func NewMainKubelet(
cpuCFSQuota: cpuCFSQuota, cpuCFSQuota: cpuCFSQuota,
daemonEndpoints: daemonEndpoints, daemonEndpoints: daemonEndpoints,
containerManager: containerManager, containerManager: containerManager,
// Flannel options
// TODO: This is currently a dummy server.
flannelHelper: NewFlannelHelper(), flannelHelper: NewFlannelHelper(),
useDefaultOverlay: useDefaultOverlay, useDefaultOverlay: useDefaultOverlay,
} }
@ -659,7 +656,6 @@ type Kubelet struct {
// oneTimeInitializer is used to initialize modules that are dependent on the runtime to be up. // oneTimeInitializer is used to initialize modules that are dependent on the runtime to be up.
oneTimeInitializer sync.Once oneTimeInitializer sync.Once
// Flannel options.
useDefaultOverlay bool useDefaultOverlay bool
flannelHelper *FlannelHelper flannelHelper *FlannelHelper
} }
@ -1129,7 +1125,6 @@ func (kl *Kubelet) syncNodeStatus() {
} }
if kl.registerNode { if kl.registerNode {
// This will exit immediately if it doesn't need to do anything. // This will exit immediately if it doesn't need to do anything.
glog.Infof("(kubelet) registering node with apiserver")
kl.registerWithApiserver() kl.registerWithApiserver()
} }
if err := kl.updateNodeStatus(); err != nil { if err := kl.updateNodeStatus(); err != nil {
@ -2588,10 +2583,10 @@ func (kl *Kubelet) updateRuntimeUp() {
func (kl *Kubelet) reconcileCBR0(podCIDR string) error { func (kl *Kubelet) reconcileCBR0(podCIDR string) error {
if podCIDR == "" { if podCIDR == "" {
glog.V(1).Info("(kubelet) PodCIDR not set. Will not configure cbr0.") glog.V(5).Info("PodCIDR not set. Will not configure cbr0.")
return nil return nil
} }
glog.V(1).Infof("(kubelet) PodCIDR is set to %q", podCIDR) glog.V(5).Infof("PodCIDR is set to %q", podCIDR)
_, cidr, err := net.ParseCIDR(podCIDR) _, cidr, err := net.ParseCIDR(podCIDR)
if err != nil { if err != nil {
return err return err
@ -2634,13 +2629,12 @@ func (kl *Kubelet) syncNetworkStatus() {
var err error var err error
if kl.configureCBR0 { if kl.configureCBR0 {
if kl.useDefaultOverlay { if kl.useDefaultOverlay {
glog.Infof("(kubelet) handshaking")
podCIDR, err := kl.flannelHelper.Handshake() podCIDR, err := kl.flannelHelper.Handshake()
if err != nil { if err != nil {
glog.Infof("Flannel server handshake failed %v", err) glog.Infof("Flannel server handshake failed %v", err)
return return
} }
glog.Infof("(kubelet) setting cidr, currently: %v -> %v", glog.Infof("Setting cidr: %v -> %v",
kl.runtimeState.podCIDR(), podCIDR) kl.runtimeState.podCIDR(), podCIDR)
kl.runtimeState.setPodCIDR(podCIDR) kl.runtimeState.setPodCIDR(podCIDR)
} }
@ -2915,7 +2909,7 @@ func (kl *Kubelet) tryUpdateNodeStatus() error {
} else if kl.reconcileCIDR { } else if kl.reconcileCIDR {
kl.runtimeState.setPodCIDR(node.Spec.PodCIDR) kl.runtimeState.setPodCIDR(node.Spec.PodCIDR)
} }
glog.Infof("(kubelet) updating node in apiserver with cidr %v", node.Spec.PodCIDR) glog.Infof("Updating node in apiserver with cidr %v", node.Spec.PodCIDR)
if err := kl.setNodeStatus(node); err != nil { if err := kl.setNodeStatus(node); err != nil {
return err return err