From cb3b858df659edcd369255317d9ea3d15dec3d29 Mon Sep 17 00:00:00 2001
From: Maxim Filatov <pipopolam@gmail.com>
Date: Wed, 31 May 2017 18:06:17 +0300
Subject: [PATCH] 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