Merge branch 1.9

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 `kubelet --hostname-override` was used #2995,#2996
+
 ## Release 1.9.6
 
 Bug fixes and minor improvements

prog/weave-kube/weave-daemonset-k8s-1.6.yaml

@@ -62,7 +62,12 @@ items:
             - name: weave
               command:
                 - /home/weave/launch.sh
-              env: []
+              env:
+                - name: HOSTNAME
+                  valueFrom:
+                    fieldRef:
+                      apiVersion: v1
+                      fieldPath: spec.nodeName
               image: 'weaveworks/weave-kube:latest'
               imagePullPolicy: Always
               livenessProbe:

prog/weave-kube/weave-daemonset.yaml

@@ -26,7 +26,12 @@ items:
             - name: weave
               command:
                 - /home/weave/launch.sh
-              env: []
+              env:
+                - name: HOSTNAME
+                  valueFrom:
+                    fieldRef:
+                      apiVersion: v1
+                      fieldPath: spec.nodeName
               image: 'weaveworks/weave-kube:latest'
               imagePullPolicy: Always
               livenessProbe: