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

Fix copying systemd libraries upon fluentd-gcp startup

Browse Source
This commit is contained in:
Mik Vyatskov 2017-02-14 15:41:15 +01:00
parent d5a4a7ca14
commit a1ec542d7c
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -2,19 +2,19 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-gcp-v1.35 name: fluentd-gcp-v1.37
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.35 version: v1.37
spec: spec:
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.35 version: v1.37
# 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).
@ -23,7 +23,7 @@ spec:
spec: spec:
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: gcr.io/google_containers/fluentd-gcp:1.35 image: gcr.io/google_containers/fluentd-gcp:1.37
# If fluentd consumes its own logs, the following situation may happen: # If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log => # fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on. # tries to send this message to the server => fails to send a chunk and so on.
@ -45,6 +45,9 @@ spec:
- name: varlibdockercontainers - name: varlibdockercontainers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers
readOnly: true readOnly: true
- name: libsystemddir
mountPath: /host/lib
readOnly: true
# Liveness probe is aimed to help in situarions where fluentd # Liveness probe is aimed to help in situarions where fluentd
# silently hangs for no apparent reasons until manual restart. # silently hangs for no apparent reasons until manual restart.
# The idea of this probe is that if fluentd is not queueing or # The idea of this probe is that if fluentd is not queueing or
@ -87,3 +90,6 @@ spec:
- name: varlibdockercontainers - name: varlibdockercontainers
hostPath: hostPath:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: libsystemddir
hostPath:
path: /usr/lib64

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

@ -26,7 +26,7 @@
.PHONY: build push .PHONY: build push
PREFIX=gcr.io/google_containers PREFIX=gcr.io/google_containers
TAG = 1.35 TAG = 1.37
build: build:
docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) . docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .

6
cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
View File

@ -17,6 +17,12 @@
# For systems without journald # For systems without journald
mkdir -p /var/log/journal mkdir -p /var/log/journal
if [ ! -z "`ls /host/lib/libsystemd* 2>/dev/null`" ]
then
rm /lib/x86_64-linux-gnu/libsystemd*
cp -a /host/lib/libsystemd* /lib/x86_64-linux-gnu/
fi
LD_PRELOAD=/opt/td-agent/embedded/lib/libjemalloc.so LD_PRELOAD=/opt/td-agent/embedded/lib/libjemalloc.so
RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0.9 RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0.9

8
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -15,7 +15,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.35 image: gcr.io/google_containers/fluentd-gcp:1.37
# If fluentd consumes its own logs, the following situation may happen: # If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log => # fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on. # tries to send this message to the server => fails to send a chunk and so on.
@ -39,6 +39,9 @@ spec:
- name: varlibdockercontainers - name: varlibdockercontainers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers
readOnly: true readOnly: true
- name: libsystemddir
mountPath: /host/lib
readOnly: true
# Liveness probe is aimed to help in situarions where fluentd # Liveness probe is aimed to help in situarions where fluentd
# silently hangs for no apparent reasons until manual restart. # silently hangs for no apparent reasons until manual restart.
# The idea of this probe is that if fluentd is not queueing or # The idea of this probe is that if fluentd is not queueing or
@ -79,3 +82,6 @@ spec:
- name: varlibdockercontainers - name: varlibdockercontainers
hostPath: hostPath:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: libsystemddir
hostPath:
path: /usr/lib64