github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2017-10-03 14:07:44 -07:00 committed by GitHub
commit a26fbbcc6e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google-containers PREFIX = gcr.io/google-containers
IMAGE = elasticsearch IMAGE = elasticsearch
TAG = v5.6.2-1 TAG = v5.6.2
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

2
cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
View File

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