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

Merge pull request #13230 from a-robinson/maintainer 

Transfer maintainer responsibilities for fluentd configs/images.
pull/6/head
Alex Robinson 2015-08-27 14:35:02 -07:00
parent 986d37d145 f6f8cb07ae
commit c9a8b2a405
5 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -1,7 +1,7 @@
# This Dockerfile will build an image that is configured # This Dockerfile will build an image that is configured
# to run Fluentd with an Elasticsearch plug-in and the # to run Fluentd with an Elasticsearch plug-in and the
# provided configuration file. # provided configuration file.
# TODO(satnam6502): Use a lighter base image, e.g. some form of busybox. # TODO(a-robinson): Use a lighter base image, e.g. some form of busybox.
# The image acts as an executable for the binary /usr/sbin/td-agent. # The image acts as an executable for the binary /usr/sbin/td-agent.
# Note that fluentd is run with root permssion to allow access to # Note that fluentd is run with root permssion to allow access to
# log files with root only access under /var/lib/docker/containers/* # log files with root only access under /var/lib/docker/containers/*
@ -9,7 +9,7 @@
# information about installing fluentd using deb package. # information about installing fluentd using deb package.
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER Satnam Singh "satnam@google.com" MAINTAINER Alex Robinson "arob@google.com"
# Ensure there are enough file descriptors for running Fluentd. # Ensure there are enough file descriptors for running Fluentd.
RUN ulimit -n 65536 RUN ulimit -n 65536

1
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View File

@ -6,7 +6,6 @@
# Elasticsearch which assumes the installation of the fluentd-elasticsearch plug-in. # Elasticsearch which assumes the installation of the fluentd-elasticsearch plug-in.
# See https://github.com/uken/fluent-plugin-elasticsearch for # See https://github.com/uken/fluent-plugin-elasticsearch for
# more information about the plug-in. # more information about the plug-in.
# Maintainer: Satnam Singh (satnam@google.com)
# #
# Example # Example
# ======= # =======

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View File

@ -7,7 +7,7 @@
# in the Google Developer Console. # in the Google Developer Console.
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER Satnam Singh "satnam@google.com" MAINTAINER Alex Robinson "arob@google.com"
# Disable prompts from apt. # Disable prompts from apt.
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

1
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -1,7 +1,6 @@
# The build rule builds a Docker image that logs all Docker contains logs to # The build rule builds a Docker image that logs all Docker contains logs to
# Google Compute Platform using the Cloud Logging API. The push rule pushes # Google Compute Platform using the Cloud Logging API. The push rule pushes
# the image to DockerHub. # the image to DockerHub.
# Satnam Singh (satnam@google.com)
# Procedure for change: # Procedure for change:
# 1. Bump the tag number. # 1. Bump the tag number.

1
cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
View File

@ -4,7 +4,6 @@
# linked to from the /varlog directory using names that capture the # linked to from the /varlog directory using names that capture the
# pod name and container name. These logs are then submitted to # pod name and container name. These logs are then submitted to
# Google Cloud Logging which assumes the installation of the cloud-logging plug-in. # Google Cloud Logging which assumes the installation of the cloud-logging plug-in.
# Maintainer: Satnam Singh (satnam@google.com)
# #
# Example # Example
# ======= # =======