From 6c2de466c0c0a54b8ac2338d56ad6b8f8ce56473 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Mon, 3 Sep 2018 13:13:30 +0530 Subject: [PATCH 1/4] add documnetatin to enable debug logging --- site/kubernetes/kube-addon.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 1f13e0a9..8ae119d1 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -198,6 +198,18 @@ $ kubectl logs -n kube-system weave-net-1jkl6 weave For easier viewing, pipe the output into a file , especially if it is long. +By default log level is set to `info`. If you wish to see more detailed logs you can set the desired log level for the `-log-level` flag through the `EXTRA_ARGS` environment variable for the `weave` and `weave-npc` containers in the weave-net daemon set. Add environment variable as below. + +```yaml + containers: + - command: + - /home/weave/launch.sh + name: weave + env: + - name: EXTRA_ARGS + value: --log-level=debug +``` + 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/) From 9cf50588b511467a876441745d1acd8cb35a4591 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Mon, 3 Sep 2018 21:01:08 +0530 Subject: [PATCH 2/4] remove weave-npc logging details --- site/kubernetes/kube-addon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 8ae119d1..5b61a2e6 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -198,7 +198,7 @@ $ kubectl logs -n kube-system weave-net-1jkl6 weave For easier viewing, pipe the output into a file , especially if it is long. -By default log level is set to `info`. If you wish to see more detailed logs you can set the desired log level for the `-log-level` flag through the `EXTRA_ARGS` environment variable for the `weave` and `weave-npc` containers in the weave-net daemon set. Add environment variable as below. +By default log level of `weave` container is set to `info` level. If you wish to see more detailed logs you can set the desired log level for the `-log-level` flag through the `EXTRA_ARGS` environment variable for the `weave` container in the weave-net daemon set. Add environment variable as below. ```yaml containers: From acc24f1237f3be7e87aa0ce51db1c54b34517218 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Tue, 4 Sep 2018 12:24:47 +0300 Subject: [PATCH 3/4] Do not exclude k8s node without any IP addr in reclaim Otherwise, such node will be rmpeer'd which can lead to the IPAM inconsistencies "Received update for IP range I own at <..>". --- prog/kube-utils/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prog/kube-utils/main.go b/prog/kube-utils/main.go index 79288a3e..24e96e84 100644 --- a/prog/kube-utils/main.go +++ b/prog/kube-utils/main.go @@ -25,7 +25,7 @@ type nodeInfo struct { } // return the IP addresses of all nodes in the cluster -func getKubePeers(c *kubernetes.Clientset) ([]nodeInfo, error) { +func getKubePeers(c *kubernetes.Clientset, includeWithNoIPAddr bool) ([]nodeInfo, error) { nodeList, err := c.CoreV1().Nodes().List(api.ListOptions{}) if err != nil { return nil, err @@ -51,6 +51,8 @@ func getKubePeers(c *kubernetes.Clientset) ([]nodeInfo, error) { addresses = append(addresses, nodeInfo{name: peer.Name, addr: internalIP}) } else if externalIP != "" { addresses = append(addresses, nodeInfo{name: peer.Name, addr: externalIP}) + } else if includeWithNoIPAddr { + addresses = append(addresses, nodeInfo{name: peer.Name, addr: ""}) } } return addresses, nil @@ -225,7 +227,7 @@ func main() { } return } - peers, err := getKubePeers(c) + peers, err := getKubePeers(c, justReclaim) if err != nil { common.Log.Fatalf("[kube-peers] Could not get peers: %v", err) } From a6e1165e717f71d898df6cacf20ab969e2b2f0b8 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 6 Sep 2018 15:21:26 +0100 Subject: [PATCH 4/4] Merge pull request #3369 from dholbach/fix-3338 docs: update ECS references --- site/install/installing-weave.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 4f4fdab1..af3bd3ce 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -48,10 +48,8 @@ To disable this check, run the following before launching Weave Net: ### Guides for Specific Platforms -CoreOS users see [here](/guides/networking-docker-containers-with-weave-on-coreos/) for an example of installing Weave using cloud-config. - -Amazon ECS users see [here](https://github.com/weaveworks/integrations/blob/master/aws/ecs/README.md) -for the latest Weave AMIs and [here](https://www.weave.works/docs/tutorials/old-guides/ecs/) to get started with Weave Net on ECS. +Amazon ECS users see [here](https://www.weave.works/docs/scope/latest/ami/) +for the latest Weave AMIs. If you're on Amazon EC2, the standard installation instructions at the top of this page, provide the simplest setup and the most flexibility.