From d8550be1805d06d226c83c1f0a1cae8438f355ab Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 17 May 2017 15:31:17 -0700 Subject: [PATCH] app-admin/kubelet-wrapper: vendor-prefix rkt volume names Since rkt 1.26.0, duplicate volume names are invalid. This avoids clashing with common user volume names like var-log. --- .../kubelet-wrapper/files/kubelet-wrapper | 32 +++++++++---------- ...ebuild => kubelet-wrapper-0.0.2-r1.ebuild} | 0 2 files changed, 16 insertions(+), 16 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/{kubelet-wrapper-0.0.2.ebuild => kubelet-wrapper-0.0.2-r1.ebuild} (100%) 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 9dd8423458..2855d8eb1b 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 @@ -62,22 +62,22 @@ KUBELET_IMAGE_ARGS=${KUBELET_IMAGE_ARGS:---exec=/kubelet} set -x exec ${RKT} ${RKT_GLOBAL_ARGS} \ run ${RKT_RUN_ARGS} \ - --volume etc-kubernetes,kind=host,source=/etc/kubernetes,readOnly=false \ - --volume etc-ssl-certs,kind=host,source=/etc/ssl/certs,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-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \ - --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 \ - --mount volume=etc-ssl-certs,target=/etc/ssl/certs \ - --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,target=/var/log \ - --mount volume=os-release,target=/etc/os-release \ - --mount volume=run,target=/run \ + --volume coreos-etc-kubernetes,kind=host,source=/etc/kubernetes,readOnly=false \ + --volume coreos-etc-ssl-certs,kind=host,source=/etc/ssl/certs,readOnly=true \ + --volume coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ + --volume coreos-var-lib-docker,kind=host,source=/var/lib/docker,readOnly=false \ + --volume coreos-var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \ + --volume coreos-var-log,kind=host,source=/var/log,readOnly=false \ + --volume coreos-os-release,kind=host,source=/usr/lib/os-release,readOnly=true \ + --volume coreos-run,kind=host,source=/run,readOnly=false \ + --mount volume=coreos-etc-kubernetes,target=/etc/kubernetes \ + --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \ + --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \ + --mount volume=coreos-var-lib-docker,target=/var/lib/docker \ + --mount volume=coreos-var-lib-kubelet,target=/var/lib/kubelet \ + --mount volume=coreos-var-log,target=/var/log \ + --mount volume=coreos-os-release,target=/etc/os-release \ + --mount volume=coreos-run,target=/run \ ${RKT_STAGE1_ARG} \ ${KUBELET_IMAGE} \ ${KUBELET_IMAGE_ARGS} \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2-r1.ebuild