Merge pull request #26650 from a-robinson/es-image

Automatic merge from submit-queue Rebuild elasticsearch image to include changes since 1.2 Fixes #25360. I've pushed the image to GCR. @jimmidyson @keontang @vishh

Merge pull request #26650 from a-robinson/es-image
431040af · k8s-merge-robot · 878d2b2f · 85795092 · 431040af · 431040af
Commit 431040af authored Jun 02, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -20,7 +20,7 @@ spec:
        kubernetes.io/cluster-service: "true"
    spec:
      containers:
-      - image: gcr.io/google_containers/elasticsearch:1.8
+      - image: gcr.io/google_containers/elasticsearch:1.9
        name: elasticsearch-logging         
        resources:
          # keep request = limit to keep this container in guaranteed class

--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -16,7 +16,7 @@

 # The current value of the tag to be used for building and
 # pushing an image to gcr.io
-TAG = 1.8
+TAG = 1.9

 build:	elasticsearch_logging_discovery
 	docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .