Merge pull request #53391 from aknuds1/rename-elasticsearch-image

Automatic merge from submit-queue. 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>. fluentd-elasticsearch add-on: Rename Docker image tag As @crassirostris requested in #53307 - rename tag of Docker image gcr.io/google-containers/elasticsearch to drop -1 suffix.

Merge pull request #53391 from aknuds1/rename-elasticsearch-image
a26fbbcc · Kubernetes Submit Queue · GitHub · 5f64769b · e04773a4 · a26fbbcc
Commit a26fbbcc authored Oct 03, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -16,7 +16,7 @@
 PREFIX = gcr.io/google-containers
 IMAGE = elasticsearch
-TAG = v5.6.2-1
+TAG = v5.6.2
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

--- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
@@ -73,7 +73,7 @@ spec:
    spec:
      serviceAccountName: elasticsearch-logging
      containers:
-      - image: gcr.io/google-containers/elasticsearch:v5.6.2-1
+      - image: gcr.io/google-containers/elasticsearch:v5.6.2
        name: elasticsearch-logging
        resources:
          # need more cpu upon initialization, therefore burstable class