github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76854 from ialidzhikov/update-images

Browse Source 
Update gem versions
This commit is contained in:
Kubernetes Prow Robot 2019-05-10 19:28:24 -07:00 committed by GitHub
commit 5669014f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -45,22 +45,22 @@ roleRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v2.5.1 name: fluentd-es-v2.5.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.5.1 version: v2.5.2
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.5.1 version: v2.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.5.1 version: v2.5.2
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
@ -72,7 +72,7 @@ spec:
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
- name: fluentd-es - name: fluentd-es
image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.1 image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.2
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
View File

@ -1,12 +1,12 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'activesupport', '~>5.2.2' gem 'activesupport', '~>5.2.2'
gem 'fluentd', '<=1.4.1' gem 'fluentd', '<=1.4.2'
gem 'fluent-plugin-concat', '~>2.3.0' gem 'fluent-plugin-concat', '~>2.3.0'
gem 'fluent-plugin-detect-exceptions', '~>0.0.12' gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
gem 'fluent-plugin-elasticsearch', '~>3.3.3' gem 'fluent-plugin-elasticsearch', '~>3.4.3'
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6' gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6'
gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'fluent-plugin-prometheus', '~>1.3.0' gem 'fluent-plugin-prometheus', '~>1.3.0'
gem 'fluent-plugin-systemd', '~>1.0.2' gem 'fluent-plugin-systemd', '~>1.0.2'
gem 'oj', '~>3.7.9' gem 'oj', '~>3.7.12'

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

@ -16,7 +16,7 @@
PREFIX = gcr.io/fluentd-elasticsearch PREFIX = gcr.io/fluentd-elasticsearch
IMAGE = fluentd IMAGE = fluentd
TAG = v2.5.1 TAG = v2.5.2
build: build:
gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG) gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)