mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 07:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2570 from dm0-/rkt-wrappers

Browse Source 
Vendor-prefix rkt volume names in wrappers
This commit is contained in:
David Michael 2017-05-18 08:54:40 -07:00 committed by GitHub
commit 41ed4ce671
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild vendored
View File

28
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper vendored
View File

@ -49,15 +49,15 @@ ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/certs}"
SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}" SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}"
if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--mount volume=systemd-dir,target=/run/systemd/system \ --mount volume=coreos-systemd-dir,target=/run/systemd/system \
--volume systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ --volume coreos-systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \
" "
fi fi
if [[ -S "${NOTIFY_SOCKET}" ]]; then if [[ -S "${NOTIFY_SOCKET}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--mount volume=notify,target=/run/systemd/notify \ --mount volume=coreos-notify,target=/run/systemd/notify \
--volume notify,kind=host,source=${NOTIFY_SOCKET} \ --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \
--set-env=NOTIFY_SOCKET=/run/systemd/notify \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \
" "
fi fi
@ -67,16 +67,16 @@ RKT_STAGE1_ARG="${RKT_STAGE1_ARG:---stage1-from-dir=stage1-fly.aci}"
set -x set -x
exec ${RKT} ${RKT_GLOBAL_ARGS} \ exec ${RKT} ${RKT_GLOBAL_ARGS} \
run ${RKT_RUN_ARGS} \ run ${RKT_RUN_ARGS} \
--volume data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ --volume coreos-data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \
--volume etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ --volume coreos-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 coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \
--volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
--mount volume=data-dir,target=/var/lib/etcd \ --mount volume=coreos-data-dir,target=/var/lib/etcd \
--mount volume=etc-ssl-certs,target=/etc/ssl/certs \ --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \
--mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \
--mount volume=etc-hosts,target=/etc/hosts \ --mount volume=coreos-etc-hosts,target=/etc/hosts \
--mount volume=etc-resolv,target=/etc/resolv.conf \ --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \
--inherit-env \ --inherit-env \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \
${ETCD_IMAGE} \ ${ETCD_IMAGE} \

28
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper vendored
View File

@ -46,15 +46,15 @@ fi
ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}" ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}"
if [[ -d "${ETCD_SSL_DIR}" ]]; then if [[ -d "${ETCD_SSL_DIR}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ --volume coreos-ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
--mount volume=ssl,target=${ETCD_SSL_DIR} \ --mount volume=coreos-ssl,target=${ETCD_SSL_DIR} \
" "
fi fi
if [[ -S "${NOTIFY_SOCKET}" ]]; then if [[ -S "${NOTIFY_SOCKET}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--mount volume=notify,target=/run/systemd/notify \ --mount volume=coreos-notify,target=/run/systemd/notify \
--volume notify,kind=host,source=${NOTIFY_SOCKET} \ --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \
--set-env=NOTIFY_SOCKET=/run/systemd/notify \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \
" "
fi fi
@ -67,16 +67,16 @@ set -x
exec ${RKT} ${RKT_GLOBAL_ARGS} \ exec ${RKT} ${RKT_GLOBAL_ARGS} \
run ${RKT_RUN_ARGS} \ run ${RKT_RUN_ARGS} \
--net=host \ --net=host \
--volume run-flannel,kind=host,source=/run/flannel,readOnly=false \ --volume coreos-run-flannel,kind=host,source=/run/flannel,readOnly=false \
--volume etc-ssl-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume coreos-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 coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \
--volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
--mount volume=run-flannel,target=/run/flannel \ --mount volume=coreos-run-flannel,target=/run/flannel \
--mount volume=etc-ssl-certs,target=/etc/ssl/certs \ --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \
--mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \
--mount volume=etc-hosts,target=/etc/hosts \ --mount volume=coreos-etc-hosts,target=/etc/hosts \
--mount volume=etc-resolv,target=/etc/resolv.conf \ --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \
--inherit-env \ --inherit-env \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \
${FLANNEL_IMAGE} \ ${FLANNEL_IMAGE} \

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1-r1.ebuild vendored
View File

32
sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper vendored
View File

@ -62,22 +62,22 @@ KUBELET_IMAGE_ARGS=${KUBELET_IMAGE_ARGS:---exec=/kubelet}
set -x set -x
exec ${RKT} ${RKT_GLOBAL_ARGS} \ exec ${RKT} ${RKT_GLOBAL_ARGS} \
run ${RKT_RUN_ARGS} \ run ${RKT_RUN_ARGS} \
--volume etc-kubernetes,kind=host,source=/etc/kubernetes,readOnly=false \ --volume coreos-etc-kubernetes,kind=host,source=/etc/kubernetes,readOnly=false \
--volume etc-ssl-certs,kind=host,source=/etc/ssl/certs,readOnly=true \ --volume coreos-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 coreos-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 coreos-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 coreos-var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \
--volume var-log,kind=host,source=/var/log,readOnly=false \ --volume coreos-var-log,kind=host,source=/var/log,readOnly=false \
--volume os-release,kind=host,source=/usr/lib/os-release,readOnly=true \ --volume coreos-os-release,kind=host,source=/usr/lib/os-release,readOnly=true \
--volume run,kind=host,source=/run,readOnly=false \ --volume coreos-run,kind=host,source=/run,readOnly=false \
--mount volume=etc-kubernetes,target=/etc/kubernetes \ --mount volume=coreos-etc-kubernetes,target=/etc/kubernetes \
--mount volume=etc-ssl-certs,target=/etc/ssl/certs \ --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \
--mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \
--mount volume=var-lib-docker,target=/var/lib/docker \ --mount volume=coreos-var-lib-docker,target=/var/lib/docker \
--mount volume=var-lib-kubelet,target=/var/lib/kubelet \ --mount volume=coreos-var-lib-kubelet,target=/var/lib/kubelet \
--mount volume=var-log,target=/var/log \ --mount volume=coreos-var-log,target=/var/log \
--mount volume=os-release,target=/etc/os-release \ --mount volume=coreos-os-release,target=/etc/os-release \
--mount volume=run,target=/run \ --mount volume=coreos-run,target=/run \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \
${KUBELET_IMAGE} \ ${KUBELET_IMAGE} \
${KUBELET_IMAGE_ARGS} \ ${KUBELET_IMAGE_ARGS} \

0
sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.2-r1.ebuild vendored
View File