From 6c674bd1e7966376d7c8ae8a8329d56b659e54c0 Mon Sep 17 00:00:00 2001 From: Marian Schwarz Date: Thu, 8 Dec 2016 15:48:24 +0100 Subject: [PATCH 1/2] -- add var-log-containers to volumes to pickup container logs in fluentd --- .../app-admin/kubelet-wrapper/files/kubelet-wrapper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper index 94a160bb3f..8a15c0db3c 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper @@ -54,6 +54,7 @@ fi mkdir --parents /etc/kubernetes mkdir --parents /var/lib/docker mkdir --parents /var/lib/kubelet +mkdir --parents /var/log/containers mkdir --parents /run/kubelet RKT="${RKT:-/usr/bin/rkt}" @@ -67,6 +68,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \ --volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume var-lib-docker,kind=host,source=/var/lib/docker,readOnly=false \ --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false \ + --volume var-log-containers,kind=host,source=/var/log/containers,readOnly=false \ --volume os-release,kind=host,source=/usr/lib/os-release,readOnly=true \ --volume run,kind=host,source=/run,readOnly=false \ --mount volume=etc-kubernetes,target=/etc/kubernetes \ @@ -74,6 +76,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \ --mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=var-lib-docker,target=/var/lib/docker \ --mount volume=var-lib-kubelet,target=/var/lib/kubelet \ + --mount volume=var-log-containers,target=/var/log/containers \ --mount volume=os-release,target=/etc/os-release \ --mount volume=run,target=/run \ ${RKT_STAGE1_ARG} \ From 1697451c6cd1abcbe9949a96dfe28b2b5fa669b0 Mon Sep 17 00:00:00 2001 From: Marian Schwarz Date: Tue, 14 Mar 2017 09:04:08 +0100 Subject: [PATCH 2/2] -- mount /var/log instead of /var/log/containers --- .../app-admin/kubelet-wrapper/files/kubelet-wrapper | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper index 8a15c0db3c..52b6c247e0 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper @@ -54,7 +54,6 @@ fi mkdir --parents /etc/kubernetes mkdir --parents /var/lib/docker mkdir --parents /var/lib/kubelet -mkdir --parents /var/log/containers mkdir --parents /run/kubelet RKT="${RKT:-/usr/bin/rkt}" @@ -68,7 +67,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \ --volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume var-lib-docker,kind=host,source=/var/lib/docker,readOnly=false \ --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false \ - --volume var-log-containers,kind=host,source=/var/log/containers,readOnly=false \ + --volume var-log,kind=host,source=/var/log,readOnly=false \ --volume os-release,kind=host,source=/usr/lib/os-release,readOnly=true \ --volume run,kind=host,source=/run,readOnly=false \ --mount volume=etc-kubernetes,target=/etc/kubernetes \ @@ -76,7 +75,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \ --mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=var-lib-docker,target=/var/lib/docker \ --mount volume=var-lib-kubelet,target=/var/lib/kubelet \ - --mount volume=var-log-containers,target=/var/log/containers \ + --mount volume=var-log,target=/var/log \ --mount volume=os-release,target=/etc/os-release \ --mount volume=run,target=/run \ ${RKT_STAGE1_ARG} \