Merge pull request #67484 from monotek/elasticsearch

Automatic merge from submit-queue (batch tested with PRs 66793, 67405, 67068, 67501, 67484). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. updates es-image to elasticsearch 6.3.2 **What this PR does / why we need it**: * updates es-image to elasticsearch 6.3.2 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note updates es-image to elasticsearch 6.3.2 ```

Merge pull request #67484 from monotek/elasticsearch
de1656ab · Kubernetes Submit Queue · GitHub · fc0fa502 · 9f88fe80 · de1656ab
Unverified Commit de1656ab authored Aug 17, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2
 VOLUME ["/data"]
 EXPOSE 9200 9300

--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -16,7 +16,7 @@
 PREFIX = staging-k8s.gcr.io
 IMAGE = elasticsearch
-TAG = v6.2.5
+TAG = v6.3.0
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .