From 65cfeff736618a12b0d914453a12a4c019fc114b Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 17 May 2017 15:28:18 -0700 Subject: [PATCH 1/3] app-admin/etcd-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. --- ...r1.ebuild => etcd-wrapper-3.1.6-r2.ebuild} | 0 .../app-admin/etcd-wrapper/files/etcd-wrapper | 28 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-3.1.6-r1.ebuild => etcd-wrapper-3.1.6-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper index 2299773578..022bc5dd65 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper @@ -49,15 +49,15 @@ ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/certs}" SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}" if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --mount volume=systemd-dir,target=/run/systemd/system \ - --volume systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ + --mount volume=coreos-systemd-dir,target=/run/systemd/system \ + --volume coreos-systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ " fi if [[ -S "${NOTIFY_SOCKET}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --mount volume=notify,target=/run/systemd/notify \ - --volume notify,kind=host,source=${NOTIFY_SOCKET} \ + --mount volume=coreos-notify,target=/run/systemd/notify \ + --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \ " fi @@ -67,16 +67,16 @@ RKT_STAGE1_ARG="${RKT_STAGE1_ARG:---stage1-from-dir=stage1-fly.aci}" set -x exec ${RKT} ${RKT_GLOBAL_ARGS} \ run ${RKT_RUN_ARGS} \ - --volume data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ - --volume etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ - --volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ - --volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ - --volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ - --mount volume=data-dir,target=/var/lib/etcd \ - --mount volume=etc-ssl-certs,target=/etc/ssl/certs \ - --mount volume=usr-share-certs,target=/usr/share/ca-certificates \ - --mount volume=etc-hosts,target=/etc/hosts \ - --mount volume=etc-resolv,target=/etc/resolv.conf \ + --volume coreos-data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ + --volume coreos-etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ + --volume coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ + --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ + --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ + --mount volume=coreos-data-dir,target=/var/lib/etcd \ + --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \ + --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \ + --mount volume=coreos-etc-hosts,target=/etc/hosts \ + --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \ --inherit-env \ ${RKT_STAGE1_ARG} \ ${ETCD_IMAGE} \ From 48ff7259e5667d088bb55c65503eab422586b34b Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 17 May 2017 15:30:22 -0700 Subject: [PATCH 2/3] app-admin/flannel-wrapper: vendor-prefix rkt volume names Since rkt 1.26.0, duplicate volume names are invalid. This avoids clashing with common user volume names. --- .../flannel-wrapper/files/flannel-wrapper | 28 +++++++++---------- ...ebuild => flannel-wrapper-0.7.1-r1.ebuild} | 0 2 files changed, 14 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.7.1.ebuild => flannel-wrapper-0.7.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper index 689c23afd2..ae27773331 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper @@ -46,15 +46,15 @@ fi ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}" if [[ -d "${ETCD_SSL_DIR}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ - --mount volume=ssl,target=${ETCD_SSL_DIR} \ + --volume coreos-ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ + --mount volume=coreos-ssl,target=${ETCD_SSL_DIR} \ " fi if [[ -S "${NOTIFY_SOCKET}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --mount volume=notify,target=/run/systemd/notify \ - --volume notify,kind=host,source=${NOTIFY_SOCKET} \ + --mount volume=coreos-notify,target=/run/systemd/notify \ + --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \ " fi @@ -67,16 +67,16 @@ set -x exec ${RKT} ${RKT_GLOBAL_ARGS} \ run ${RKT_RUN_ARGS} \ --net=host \ - --volume run-flannel,kind=host,source=/run/flannel,readOnly=false \ - --volume etc-ssl-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ - --volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ - --volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ - --volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ - --mount volume=run-flannel,target=/run/flannel \ - --mount volume=etc-ssl-certs,target=/etc/ssl/certs \ - --mount volume=usr-share-certs,target=/usr/share/ca-certificates \ - --mount volume=etc-hosts,target=/etc/hosts \ - --mount volume=etc-resolv,target=/etc/resolv.conf \ + --volume coreos-run-flannel,kind=host,source=/run/flannel,readOnly=false \ + --volume coreos-etc-ssl-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ + --volume coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ + --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ + --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ + --mount volume=coreos-run-flannel,target=/run/flannel \ + --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \ + --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \ + --mount volume=coreos-etc-hosts,target=/etc/hosts \ + --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \ --inherit-env \ ${RKT_STAGE1_ARG} \ ${FLANNEL_IMAGE} \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1-r1.ebuild From d8550be1805d06d226c83c1f0a1cae8438f355ab Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 17 May 2017 15:31:17 -0700 Subject: [PATCH 3/3] 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