From 38d50ce6fb169cb31c35bf40ddff015ebeb027d4 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 22 Nov 2017 13:51:08 +0000 Subject: [PATCH 1/3] Note that WeaveDNS is disabled in Kubernetes addon --- site/tasks/weavedns/weavedns.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index c66da58f..867bdb21 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -43,6 +43,10 @@ To disable an application container's use of weaveDNS, add the `--without-dns` option to `weave launch`. To disable weaveDNS itself, launch weave with the `--no-dns` option. +> **Note** WeaveDNS is not part of the Weave Net Kubernetes add-on. + Kubernetes has its own DNS service, integrated with Kubernetes + Services, and WeaveDNS does not duplicate that functionality. + **See Also** * [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) From 890c8c19058bd403c4176e5ba6c20e1d7925aa3a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 4 Jan 2018 13:18:01 +0000 Subject: [PATCH 2/3] Extend description of weave-kube and mention WeaveDNS is disabled --- site/kubernetes/kube-addon.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 917f443a..2a3d7502 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -11,7 +11,9 @@ The following topics are discussed: * [Upgrading the Daemon Sets](#daemon-sets) * [CPU and Memory Requirements](#resources) * [Pod Eviction](#eviction) -* [Network Policy Controller](#npc) +* [Features](#features) + * [Pod Network](#pod-network) + * [Network Policy](#npc) * [Troubleshooting](#troubleshooting) * [Troubleshooting Blocked Connections](#blocked-connections) * [Things to watch out for](#key-points) @@ -147,7 +149,25 @@ mypod-09vkd 0/1 Evicted 0 1h node-1 If you see this in your cluster, consider some of the above steps to reduce disruption. -## Network Policy Controller +## Features + +### Pod Network + +Weave Net provides a network to connect all pods together, +implementing the [Kubernetes +model](https://kubernetes.io/docs/concepts/cluster-administration/networking/#kubernetes-model). + +Kubernetes uses the _Container Network Interface_ +([CNI](https://github.com/containernetworking/cni)) to join pods onto Weave Net. + +Kubernetes implements many network features itself on top of the pod +network. This includes +[Services](https://kubernetes.io/docs/concepts/services-networking/service/), +[Service Discovery via DNS](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/) +and [Ingress into the cluster](https://kubernetes.io/docs/concepts/services-networking/ingress/). +WeaveDNS is disabled when using the Kubernetes addon. + +### Network Policy The addon also supports the [Kubernetes policy API](http://kubernetes.io/docs/user-guide/networkpolicies/) so that From 48e1a8295b24d4a9f5d6588f9e7c65c76f53423e Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 4 Jan 2018 13:27:52 +0000 Subject: [PATCH 3/3] Update Kubernetes docs info --- site/kubernetes/kube-addon.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 2a3d7502..1431d514 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -169,12 +169,11 @@ WeaveDNS is disabled when using the Kubernetes addon. ### Network Policy -The addon also supports the [Kubernetes policy -API](http://kubernetes.io/docs/user-guide/networkpolicies/) so that -you can securely isolate pods from each other based on namespaces and +[Kubernetes Network Policies](https://kubernetes.io/docs/concepts/services-networking/network-policies/) let +you securely isolate pods from each other based on namespaces and labels. For more information on configuring network policies in Kubernetes see the -[walkthrough](http://kubernetes.io/docs/getting-started-guides/network-policy/walkthrough/) +[walkthrough](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy/) and the [NetworkPolicy API object definition](https://v1-7.docs.kubernetes.io/docs/api-reference/v1.7/#networkpolicy-v1-networking) @@ -187,6 +186,11 @@ definition](https://v1-7.docs.kubernetes.io/docs/api-reference/v1.7/#networkpoli ## Troubleshooting +Many Kubernetes network issues occur at a higher level than Weave Net. +The [Kubernetes Service Debugging Guide] +(https://kubernetes.io/docs/tasks/debug-application-cluster/debug-service/) +has a detailed step-by-step guide. + The status of Weave Net can be checked by running its CLI commands. This can be done in various ways: 1\. [Install the `weave` script](/site/installing-weave.md) and run: