From b00f502aea3afedd7411b6e00133bcf6258560a7 Mon Sep 17 00:00:00 2001 From: Fabian Ruff Date: Tue, 10 Apr 2018 11:51:37 +0200 Subject: [PATCH 1/2] pass /etc/machine-id from host to kubelet Otherwise kubelet/cadvisor picks up whatever is shipped in the container image, which results in all nodes report the same value for `status.nodeInfo.machineID` --- .../app-admin/kubelet-wrapper/files/kubelet-wrapper | 2 ++ 1 file changed, 2 insertions(+) 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 78d06936d3..6dbfcec3b2 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 @@ -71,6 +71,7 @@ exec ${RKT} ${RKT_GLOBAL_ARGS} \ --volume coreos-os-release,kind=host,source=/usr/lib/os-release,readOnly=true \ --volume coreos-run,kind=host,source=/run,readOnly=false \ --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-ssl-certs,target=/etc/ssl/certs \ --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-run,target=/run \ --mount volume=coreos-lib-modules,target=/lib/modules \ + --mount volume=coreos-etc-machine-id,target=/etc/machine-id \ --hosts-entry host \ ${RKT_STAGE1_ARG} \ ${KUBELET_IMAGE} \ From 1614ed8f5843da2518c3ba3b5978ececf64a5451 Mon Sep 17 00:00:00 2001 From: Fabian Ruff Date: Wed, 18 Apr 2018 09:41:55 +0200 Subject: [PATCH 2/2] Bump kubelet-wrapper ebuild to 0.0.4 --- ...{kubelet-wrapper-0.0.3.ebuild => kubelet-wrapper-0.0.4.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/{kubelet-wrapper-0.0.3.ebuild => kubelet-wrapper-0.0.4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild