github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37100 from apatil/master

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2016-12-19 09:38:42 -08:00 committed by GitHub
commit def8022729
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/fluentd-elasticsearch/es-controller.yaml
View File

@ -38,6 +38,11 @@ spec:
volumeMounts: volumeMounts:
- name: es-persistent-storage - name: es-persistent-storage
mountPath: /data mountPath: /data
env:
- name: "NAMESPACE"
valueFrom:
fieldRef:
fieldPath: metadata.namespace
volumes: volumes:
- name: es-persistent-storage - name: es-persistent-storage
emptyDir: {} emptyDir: {}