github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10801 from satnam6502/es-image 

Remove use of v1beta3 from ES logging
pull/6/head
Wojciech Tyczynski 2015-07-07 14:15:48 +02:00
parent 73cb04ad6b 691c07763c
commit d170ab08da
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.5 - image: gcr.io/google_containers/elasticsearch:1.7
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
limits: limits:

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

@ -2,7 +2,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.5 TAG = 1.7
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) .