forked from openshift/installer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: overlay node image before bootstrapping if necessary
As per openshift/enhancements#1637, we're trying to get rid of all OpenShift-versioned components from the bootimages. This means that there will no longer be `oc`, `kubelet`, or `crio` binaries for example, which bootstrapping obviously relies on. Instead, now we change things up so that early on when booting the bootstrap node, we pull down the node image, unencapsulate it (this just means convert it back to an OSTree commit), then mount over its `/usr`, and import new `/etc` content. This is done by isolating to a different systemd target to only bring up the minimum number of services to do the pivot and then carry on with bootstrapping. This does not incur additional reboots and should be compatible with AI/ABI/SNO. But it is of course, a huge conceptual shift in how bootstrapping works. With this, we would now always be sure that we're using the same binaries as the target version as part of bootstrapping, which should alleviate some issues such as AI late-binding (see e.g. https://issues.redhat.com/browse/MGMT-16705). The big exception of course being the kernel. Relatedly, note we do persist `/usr/lib/modules` from the booted system so that loading kernel modules still works. To be conservative, the new logic only kicks in when using bootimages which do not have `oc`. This will allow us to ratchet this in more easily. Down the line, we should be able to replace some of this with `bootc apply-live` once that's available (and also works in a live environment). (See containers/bootc#76.) For full context, see the linked enhancement and discussions there.
- Loading branch information
Showing
8 changed files
with
146 additions
and
1 deletion.
There are no files selected for viewing
9 changes: 9 additions & 0 deletions
9
data/data/bootstrap/files/etc/systemd/system-generators/node-image-overlay-generator
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#!/bin/bash | ||
set -euo pipefail | ||
|
||
UNIT_DIR="${1:-/tmp}" | ||
|
||
if ! rpm -q openshift-clients &>/dev/null; then | ||
ln -sf "/etc/systemd/system/node-image-overlay.target" \ | ||
"${UNIT_DIR}/default.target" | ||
fi |
12 changes: 12 additions & 0 deletions
12
data/data/bootstrap/files/etc/systemd/system/node-image-finish.service
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# This is a separate unit because in the assisted-installer flow, we only want | ||
# `node-image-overlay.service`, not the isolating back to `multi-user.target`. | ||
|
||
[Unit] | ||
Description=Node Image Finish | ||
Requires=node-image-overlay.service | ||
After=node-image-overlay.service | ||
|
||
[Service] | ||
Type=oneshot | ||
# and now, back to our regularly scheduled programming... | ||
ExecStart=/usr/bin/systemctl --no-block isolate multi-user.target |
9 changes: 9 additions & 0 deletions
9
data/data/bootstrap/files/etc/systemd/system/node-image-overlay.service
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[Unit] | ||
Description=Node Image Overlay | ||
Requires=node-image-pull.service | ||
After=node-image-pull.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/node-image-overlay.sh | ||
RemainAfterExit=yes |
9 changes: 9 additions & 0 deletions
9
data/data/bootstrap/files/etc/systemd/system/node-image-overlay.target
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[Unit] | ||
Description=Node Image Overlay Target | ||
Requires=basic.target | ||
|
||
# for easier debugging | ||
Requires=sshd.service getty.target systemd-user-sessions.service | ||
|
||
Requires=node-image-overlay.service | ||
Requires=node-image-finish.service |
16 changes: 16 additions & 0 deletions
16
data/data/bootstrap/files/etc/systemd/system/node-image-pull.service
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
[Unit] | ||
Description=Node Image Pull | ||
Requires=network.target NetworkManager.service | ||
After=network.target | ||
|
||
[Service] | ||
Type=oneshot | ||
# we need to call ostree container (i.e. rpm-ostree), which has install_exec_t, | ||
# but by default, we'll run as unconfined_service_t, which is not allowed that | ||
# transition. Relabel the script itself. | ||
ExecStartPre=chcon --reference=/usr/bin/ostree /usr/local/bin/node-image-pull.sh | ||
ExecStart=/usr/local/bin/node-image-pull.sh | ||
# see related XXX in node-image-pull.sh | ||
TimeoutStartSec=infinity | ||
MountFlags=slave | ||
RemainAfterExit=yes |
17 changes: 17 additions & 0 deletions
17
data/data/bootstrap/files/usr/local/bin/node-image-overlay.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/bin/bash | ||
set -euo pipefail | ||
|
||
ostree_repo=/var/ostree-container/repo | ||
if [ ! -d "${ostree_repo}" ]; then | ||
ostree_repo=/ostree/repo | ||
fi | ||
|
||
checkout="${ostree_repo}/tmp/node-image" | ||
|
||
# keep /usr/lib/modules from the booted deployment for kernel modules | ||
mount -o bind,ro "/usr/lib/modules" "${checkout}/usr/lib/modules" | ||
mount -o rbind,ro "${checkout}/usr" /usr | ||
rsync -av "${checkout}/usr/etc/" /etc | ||
|
||
# reload the new policy | ||
semodule -R |
73 changes: 73 additions & 0 deletions
73
data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
#!/bin/bash | ||
set -euo pipefail | ||
|
||
# shellcheck source=release-image.sh.template | ||
. /usr/local/bin/release-image.sh | ||
|
||
# yuck... this is a good argument for renaming the node image to just `node` in both OCP and OKD | ||
coreos_img=rhel-coreos | ||
{{ if .IsOKD }} | ||
coreos_img=stream-coreos | ||
{{ end }} | ||
# XXX: Unset NOTIFY_SOCKET for podman to workaround an outstanding bug in | ||
# RHEL. When it sees the socket, it wants to keep extending the service start | ||
# timeout. It writes to stderr, but we use `--quiet` which leaves it null, | ||
# so it hits SIGSEGV. To work around not having timeout extensions; we use | ||
# TimeoutStartSec=infinity. | ||
# This is fixed upstream by https://github.com/containers/common/pull/1758. | ||
# Should request backport... | ||
while ! COREOS_IMAGE=$(unset NOTIFY_SOCKET; image_for ${coreos_img}); do | ||
echo 'Failed to query release image; retrying...' | ||
sleep 10 | ||
done | ||
|
||
# try to do this in the system repo so we get hardlinks and the checkout is | ||
# read-only, but fallback to using /var if we're in the live environment since | ||
# that's truly read-only | ||
ostree_repo=/ostree/repo | ||
hardlink='-H' | ||
if grep -q coreos.liveiso= /proc/cmdline; then | ||
ostree_repo=/var/ostree-container/repo | ||
mkdir -p "${ostree_repo}" | ||
ostree init --mode=bare --repo="${ostree_repo}" | ||
# use the system repo as parent to still get layer deduping | ||
ostree config --repo="${ostree_repo}" set core.parent /ostree/repo | ||
# but we won't be able to force hardlinks cross-device | ||
hardlink='' | ||
else | ||
# (remember, we're MountFlags=slave) | ||
mount -o rw,remount /sysroot | ||
fi | ||
|
||
# Use ostree stack to pull the container here. This gives us efficient | ||
# downloading with layers we already have, and also handles SELinux. | ||
while ! ostree container image pull --authfile "/root/.docker/config.json" \ | ||
"${ostree_repo}" ostree-unverified-image:docker://"${COREOS_IMAGE}"; do | ||
echo 'Failed to fetch release image; retrying...' | ||
sleep 10 | ||
done | ||
|
||
# ideally, `ostree container image pull` would support `--write-ref` or a | ||
# command to escape a pullspec, but for now it's pretty easy to tell which ref | ||
# it is since it's the only docker one | ||
ref=$(ostree refs | grep ^ostree/container/image/docker) | ||
if [ $(echo "$ref" | wc -l) != 1 ]; then | ||
echo "Expected single docker ref, found:" | ||
echo "$ref" | ||
exit 1 | ||
fi | ||
ostree refs "$ref" --create coreos/node-image | ||
|
||
# massive hack to make ostree admin config-diff work in live ISO where /etc | ||
# is actually on a separate mount and not the deployment root proper... should | ||
# enhance libostree for this (remember, we're MountFlags=slave) | ||
if grep -q coreos.liveiso= /proc/cmdline; then | ||
mount -o bind,ro /etc /ostree/deploy/*/deploy/*/etc | ||
fi | ||
|
||
# get all state files in /etc; this is a cheap way to get "3-way /etc merge" semantics | ||
etc_keep=$(ostree admin config-diff | cut -f5 -d' ' | sed -e 's,^,/usr/etc/,') | ||
|
||
# check out the commit | ||
checkout="${ostree_repo}/tmp/node-image" | ||
ostree checkout --repo "${ostree_repo}" ${hardlink} coreos/node-image "${checkout}" --skip-list=<(cat <<< "$etc_keep") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters