From 83df5b84959bb57e7b1c5acc0005ab1598f2372c Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Tue, 17 Jan 2017 14:53:55 +0100
Subject: [PATCH] Remove library copying from fluentd image

---
 cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml      | 13 ++++---------
 .../addons/fluentd-gcp/fluentd-gcp-image/Makefile   |  2 +-
 cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh |  6 ------
 cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml  |  7 +------
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
index e070f6f37cf..63902894e01 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -2,23 +2,23 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: fluentd-gcp-v1.31
+  name: fluentd-gcp-v1.33
   namespace: kube-system
   labels:
     k8s-app: fluentd-gcp
     kubernetes.io/cluster-service: "true"
-    version: v1.31
+    version: v1.33
 spec:
   template:
     metadata:
       labels:
         k8s-app: fluentd-gcp
         kubernetes.io/cluster-service: "true"
-        version: v1.31
+        version: v1.33
     spec:
       containers:
       - name: fluentd-gcp
-        image: gcr.io/google_containers/fluentd-gcp:1.32
+        image: gcr.io/google_containers/fluentd-gcp:1.33
         # 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 =>
         # tries to send this message to the server => fails to send a chunk and so on.
@@ -40,8 +40,6 @@ spec:
         - name: varlibdockercontainers
           mountPath: /var/lib/docker/containers
           readOnly: true
-        - name: libsystemddir
-          mountPath: /host/lib
         # Liveness probe is aimed to help in situarions where fluentd
         # silently hangs for no apparent reasons until manual restart.
         # The idea of this probe is that if fluentd is not queueing or
@@ -84,6 +82,3 @@ spec:
       - name: varlibdockercontainers
         hostPath:
           path: /var/lib/docker/containers
-      - name: libsystemddir
-        hostPath:
-          path: /usr/lib64
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index c3c92206095..2109f54b11f 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -26,7 +26,7 @@
 .PHONY:	build push
 
 PREFIX=gcr.io/google_containers
-TAG = 1.32
+TAG = 1.33
 
 build:
 	docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh b/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
index c1ec1036d18..48cf7b21080 100755
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/run.sh
@@ -17,12 +17,6 @@
 # For systems without journald
 mkdir -p /var/log/journal
 
-if [ -e /host/lib/libsystemd* ]
-then
-  rm /lib/x86_64-linux-gnu/libsystemd*
-  cp /host/lib/libsystemd* /lib/x86_64-linux-gnu/
-fi
-
 LD_PRELOAD=/opt/td-agent/embedded/lib/libjemalloc.so
 RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0.9
 
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index d1816a4fe22..a5ea492a5e0 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -10,7 +10,7 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.32
+    image: gcr.io/google_containers/fluentd-gcp:1.33
     # 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 =>
     # tries to send this message to the server => fails to send a chunk and so on.
@@ -34,8 +34,6 @@ spec:
     - name: varlibdockercontainers
       mountPath: /var/lib/docker/containers
       readOnly: true
-    - name: libsystemddir
-      mountPath: /host/lib
     # Liveness probe is aimed to help in situarions where fluentd
     # silently hangs for no apparent reasons until manual restart.
     # The idea of this probe is that if fluentd is not queueing or
@@ -63,6 +61,3 @@ spec:
   - name: varlibdockercontainers
     hostPath:
       path: /var/lib/docker/containers
-  - name: libsystemddir
-    hostPath:
-      path: /usr/lib64