Merge pull request #2308 from sapcc/master

Expose container logs out of kubelet-wrapper
This commit is contained in:
Alex Crawford 2017-03-14 14:23:15 -07:00 committed by GitHub
commit 1a7471b224

View File

@ -67,6 +67,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \
--volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --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-docker,kind=host,source=/var/lib/docker,readOnly=false \
--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false \ --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,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 os-release,kind=host,source=/usr/lib/os-release,readOnly=true \
--volume run,kind=host,source=/run,readOnly=false \ --volume run,kind=host,source=/run,readOnly=false \
--mount volume=etc-kubernetes,target=/etc/kubernetes \ --mount volume=etc-kubernetes,target=/etc/kubernetes \
@ -74,6 +75,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \
--mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=usr-share-certs,target=/usr/share/ca-certificates \
--mount volume=var-lib-docker,target=/var/lib/docker \ --mount volume=var-lib-docker,target=/var/lib/docker \
--mount volume=var-lib-kubelet,target=/var/lib/kubelet \ --mount volume=var-lib-kubelet,target=/var/lib/kubelet \
--mount volume=var-log,target=/var/log \
--mount volume=os-release,target=/etc/os-release \ --mount volume=os-release,target=/etc/os-release \
--mount volume=run,target=/run \ --mount volume=run,target=/run \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \