From f8ea35d176ba0cd743c3def16094c6086ba05f9c Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 23 Oct 2019 17:26:06 +0200 Subject: [PATCH] bootstrap: pull MCD image, copy machine-config-daemon binary and run pivot before proceeding This ensures bootstrap node uses latest crio/kubelet from oscontainer. --- .../files/usr/local/bin/bootkube.sh.template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template index a8f536325bb..b9fd6e352fa 100755 --- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template +++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template @@ -37,6 +37,23 @@ MDNS_PUBLISHER_IMAGE=$(image_for mdns-publisher) HAPROXY_IMAGE=$(image_for haproxy-router) BAREMETAL_RUNTIMECFG_IMAGE=$(image_for baremetal-runtimecfg) +# Copy machine-config-daemon binary from payload and run pivot +if [ ! -f .pivot-done ]; then + mkdir /run/pivot /etc/pivot + touch /run/pivot/reboot-needed + echo "${MACHINE_CONFIG_OSCONTENT}" > /etc/pivot/image-pullspec + + mkdir bin/ + bootkube_podman_run \ + --volume "$PWD/bin:/host/usr/local/bin:z" \ + --entrypoint=sh \ + "${MACHINE_CONFIG_OPERATOR_IMAGE}" \ + -c "cp /usr/bin/machine-config-daemon /host/usr/local/bin" + + touch .pivot-done + ./bin/machine-config-daemon pivot +fi + mkdir --parents ./{bootstrap-manifests,manifests} if [ ! -f openshift-manifests.done ]