github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
k8s-merge-robot 2016-06-02 01:59:40 -07:00
commit 431040afd8
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-controller.yaml
View File

@ -20,7 +20,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/elasticsearch:1.8 - image: gcr.io/google_containers/elasticsearch:1.9
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

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

@ -16,7 +16,7 @@
# The current value of the tag to be used for building and # The current value of the tag to be used for building and
# pushing an image to gcr.io # pushing an image to gcr.io
TAG = 1.8 TAG = 1.9
build: elasticsearch_logging_discovery build: elasticsearch_logging_discovery
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .