From cb3b858df659edcd369255317d9ea3d15dec3d29 Mon Sep 17 00:00:00 2001 From: Maxim Filatov Date: Wed, 31 May 2017 18:06:17 +0300 Subject: [PATCH 1/3] Weave-NPC should get hostname from K8s Downward API. It is necessary in case when kubelet's args includes `--hostname_override=`. Without this change, pods on hostname overriding kubelets will never be local, and all pod's traffic will be blocked. --- prog/weave-kube/weave-daemonset-k8s-1.6.yaml | 6 ++++++ prog/weave-kube/weave-daemonset.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml index 5e2aeafc..d93b03ab 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml @@ -92,6 +92,12 @@ spec: cpu: 10m securityContext: privileged: true + env: + - name: HOSTNAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName restartPolicy: Always tolerations: - key: node-role.kubernetes.io/master diff --git a/prog/weave-kube/weave-daemonset.yaml b/prog/weave-kube/weave-daemonset.yaml index 88aaabe7..eacfb9f3 100644 --- a/prog/weave-kube/weave-daemonset.yaml +++ b/prog/weave-kube/weave-daemonset.yaml @@ -59,6 +59,12 @@ spec: cpu: 10m securityContext: privileged: true + env: + - name: HOSTNAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName restartPolicy: Always volumes: - name: weavedb From 1abdc3afcf097e533f603bbf9c33cdc64c26f076 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 1 Jun 2017 13:51:06 +0000 Subject: [PATCH 2/3] Add release v1.9.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 387fbc52..b6cc883b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Release 1.9.7 + +This is identical to 1.9.6 with one additional bug-fix: + +* weave-npc would block everything if `kubectl --hostname-override` was used #2995,#2996 + ## Release 1.9.6 Bug fixes and minor improvements From 6bd11a426e0133eeed50f5f33a79347e9732dd3a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 1 Jun 2017 14:28:10 +0000 Subject: [PATCH 3/3] typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6cc883b..38cac858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This is identical to 1.9.6 with one additional bug-fix: -* weave-npc would block everything if `kubectl --hostname-override` was used #2995,#2996 +* weave-npc would block everything if `kubelet --hostname-override` was used #2995,#2996 ## Release 1.9.6