From e2c50152ddf4a45e0fa66f9eb903096e63957c73 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Mon, 1 Aug 2016 17:47:04 -0400 Subject: [PATCH] Remove kubernetes metadata plugin --- .../fluentd-elasticsearch/fluentd-es-image/Dockerfile | 2 +- .../addons/fluentd-elasticsearch/fluentd-es-image/build.sh | 6 ++++-- .../fluentd-elasticsearch/fluentd-es-image/td-agent.conf | 6 +++--- cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile | 2 +- cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile | 2 +- cluster/saltbase/salt/fluentd-es/fluentd-es.yaml | 2 +- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile index af5eba676c8..2581f54dd03 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile @@ -22,7 +22,7 @@ # Please see http://docs.fluentd.org/articles/install-by-deb for more # information about installing fluentd using deb package. -FROM gcr.io/google_containers/ubuntu-slim:0.3 +FROM gcr.io/google_containers/ubuntu-slim:0.4 MAINTAINER Alex Robinson "arob@google.com" MAINTAINER Jimmi Dyson "jimmidyson@gmail.com" diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh index 68b45423326..9a4723915e5 100755 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2016 The Kubernetes Authors All rights reserved. +# Copyright 2015 The Kubernetes Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,7 +29,9 @@ apt-get install -y -q --no-install-recommends \ sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent # Install the Elasticsearch Fluentd plug-in. -td-agent-gem install fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch +# http://docs.fluentd.org/articles/plugin-management +td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.24.0 +td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.5.0 # Remove docs and postgres references rm -rf /opt/td-agent/embedded/share/doc \ diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf index 5467996bacf..cf331820640 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf @@ -218,9 +218,9 @@ tag kube-scheduler - - type kubernetes_metadata - +# +# type kubernetes_metadata +# # Example: # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile index 24cf03a9c8d..f2244a57bd9 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile @@ -20,7 +20,7 @@ # scope and that the Logging API has been enabled for the project # in the Google Developer Console. -FROM gcr.io/google_containers/ubuntu-slim:0.3 +FROM gcr.io/google_containers/ubuntu-slim:0.4 MAINTAINER Alex Robinson "arob@google.com" # Disable prompts from apt. diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index 7c0688ea506..38ce3edc0f2 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile @@ -28,7 +28,7 @@ .PHONY: kbuild kpush -TAG = 1.22 +TAG = 1.25 # Rules for building the test image for deployment to Dockerhub with user kubernetes. diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml index 0576ea4a68f..5f72b7bad23 100644 --- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml +++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: fluentd-elasticsearch - image: aledbf/fluentd-elasticsearch:1.19 + image: gcr.io/google_containers/fluentd-elasticsearch:1.17 resources: limits: memory: 200Mi diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 57f01232fc0..15226d5d6bf 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -11,7 +11,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-cloud-logging - image: aledbf/fluentd-gcp:1.22 + image: gcr.io/google_containers/fluentd-gcp:1.21 resources: limits: memory: 200Mi