Merge "Move KUBERNETES_NODE_NAME env var to controller"

2018-10-26 13:49:56 +00:00 · 2018-10-26 13:49:56 +00:00 · 349e25a4ba
parent 374c57d66d f0cde86ee6
commit 349e25a4ba
1 changed files with 5 additions and 4 deletions
--- a/devstack/lib/kuryr_kubernetes
+++ b/devstack/lib/kuryr_kubernetes
@ -585,6 +585,11 @@ EOF
        imagePullPolicy: Never
        name: controller
        terminationMessagePath: "/dev/termination-log"
+        env:
+        - name: KUBERNETES_NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
        volumeMounts:
        - name: config-volume
          mountPath: "/etc/kuryr/kuryr.conf"
@ -653,10 +658,6 @@ spec:
        imagePullPolicy: Never
        command: [ "cni_ds_init" ]
        env:
-        - name: KUBERNETES_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
        - name: KURYR_CNI_POD_NAME
          valueFrom:
            fieldRef: