github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37283 from Crassirostris/fluentd-es-image-version-bump

Browse Source 
Automatic merge from submit-queue

Bump fluentd-es image version

New image version, containing changes from https://github.com/kubernetes/kubernetes/pull/37123 and https://github.com/kubernetes/kubernetes/pull/37219

Should be merged only after those two

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-11-22 12:47:14 -08:00 committed by GitHub
commit b3a89cc988
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,11 +14,12 @@
.PHONY: build push .PHONY: build push
PREFIX = gcr.io/google_containers
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.19 TAG = 1.20
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
push: push:
gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker --server=gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)

2
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-elasticsearch - name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.19 image: gcr.io/google_containers/fluentd-elasticsearch:1.20
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi