Merge pull request #3051 from /issues/3049-kube-hostnames

Add back HOSTNAME env var for weave-npc container
weaveworks · Jul 4, 2017 · b5759c5 · b5759c5
2 parents d8222d7 + 6b4c6c8
commit b5759c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml
@@ -97,6 +97,12 @@ items:
                 - name: lib-modules
                   mountPath: /lib/modules
             - name: weave-npc
+              env:
+                - name: HOSTNAME
+                  valueFrom:
+                    fieldRef:
+                      apiVersion: v1
+                      fieldPath: spec.nodeName
               image: 'weaveworks/weave-npc:latest'
               imagePullPolicy: Always
               resources:

diff --git a/prog/weave-kube/weave-daemonset.yaml b/prog/weave-kube/weave-daemonset.yaml
@@ -61,6 +61,12 @@ items:
                 - name: lib-modules
                   mountPath: /lib/modules
             - name: weave-npc
+              env:
+                - name: HOSTNAME
+                  valueFrom:
+                    fieldRef:
+                      apiVersion: v1
+                      fieldPath: spec.nodeName
               image: 'weaveworks/weave-npc:latest'
               imagePullPolicy: Always
               resources: