mirror of https://github.com/k3s-io/k3s
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 ```pull/6/head
commit
def8022729
|
@ -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: {}
|
||||||
|
|
Loading…
Reference in New Issue