Merge pull request #37100 from apatil/master

Automatic merge from submit-queue Adding NAMESPACE to elasticsearch pod environment from downward API **What this PR does / why we need it**: The elasticsearch cluster addon references the `NAMESPACE` environmental variable here: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go#L56 but, on k8s 1.3.7 at least, it is not automatically set. This PR gets it from the downward API. **Release note**: ```NONE ```

Merge pull request #37100 from apatil/master
def80227 · Kubernetes Submit Queue · GitHub · ce67a03b · 28c36afc · def80227
Commit def80227 authored Dec 19, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

es-controller.yaml cluster/addons/fluentd-elasticsearch/es-controller.yaml +5 -0

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -38,6 +38,11 @@ spec:
        volumeMounts:
        - name: es-persistent-storage
          mountPath: /data
+        env:
+        - name: "NAMESPACE"
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
      volumes:
      - name: es-persistent-storage
        emptyDir: {}