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

Merge pull request #3169 from databus23/patch-2

Browse Source 
pass /etc/machine-id from host to kubelet
This commit is contained in:
Euan Kemp 2018-04-18 12:25:42 -07:00 committed by GitHub
commit e85c49ef0d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \
--volume coreos-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 coreos-run,kind=host,source=/run,readOnly=false \ --volume coreos-run,kind=host,source=/run,readOnly=false \
--volume coreos-lib-modules,kind=host,source=/lib/modules,readOnly=true \ --volume coreos-lib-modules,kind=host,source=/lib/modules,readOnly=true \
--volume coreos-etc-machine-id,kind=host,source=/etc/machine-id,readOnly=true \
--mount volume=coreos-etc-kubernetes,target=/etc/kubernetes \ --mount volume=coreos-etc-kubernetes,target=/etc/kubernetes \
--mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \ --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \
--mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \
@ -80,6 +81,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \
--mount volume=coreos-os-release,target=/etc/os-release \ --mount volume=coreos-os-release,target=/etc/os-release \
--mount volume=coreos-run,target=/run \ --mount volume=coreos-run,target=/run \
--mount volume=coreos-lib-modules,target=/lib/modules \ --mount volume=coreos-lib-modules,target=/lib/modules \
--mount volume=coreos-etc-machine-id,target=/etc/machine-id \
--hosts-entry host \ --hosts-entry host \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \
${KUBELET_IMAGE} \ ${KUBELET_IMAGE} \

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