Merge pull request #8199 from satnam6502/es

Revert to using emptyDir for Elasticsearch data

cluster/addons/fluentd-elasticsearch/es-controller.yaml

@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - image: gcr.io/google_containers/elasticsearch:1.2
+      - image: gcr.io/google_containers/elasticsearch:1.3
         name: elasticsearch-logging
         ports:
         - containerPort: 9200
@@ -29,7 +29,11 @@ spec:
         - name: token-system-logging
           mountPath: /etc/token-system-logging
           readOnly: true
+        - name: es-persistent-storage
+          mountPath: /data
       volumes:
       - name: token-system-logging
         secret:
           secretName: token-system-logging
+      - name: es-persistent-storage
+        emptyDir: {}

cluster/addons/fluentd-elasticsearch/es-image/Dockerfile

@@ -20,6 +20,7 @@ COPY elasticsearch.yml /elasticsearch-1.5.2/config/elasticsearch.yml
 COPY run.sh /
 COPY elasticsearch_logging_discovery /
 
+VOLUME ["/data"]
 EXPOSE 9200 9300
 
 CMD ["/run.sh"]

cluster/addons/fluentd-elasticsearch/es-image/Makefile

@@ -1,6 +1,6 @@
 .PHONY:	elasticsearch_logging_discovery build push
 
-TAG = 1.2
+TAG = 1.3
 
 build:	elasticsearch_logging_discovery	
 	docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .

cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml

@@ -4,3 +4,4 @@ node.data: ${NODE_DATA}
 transport.tcp.port: ${TRANSPORT_PORT}
 http.port: ${HTTP_PORT}
 discovery.zen.ping.multicast.enabled: false
+path.data: /data