Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO #6965

Merged
merged 1 commit into from
Mar 23, 2023
Merged

OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO #6965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/data/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{{if .IsOKD -}}
#!/usr/bin/env bash
set -euo pipefail

# Exit early if pivot is attempted on SCOS Live ISO
{{if .IsSCOS -}}
source /etc/os-release
if [[ ! $(touch /usr/.test) ]] && [[ ${ID} =~ ^(centos)$ ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not going to work on any live ISO right? As we move towards potentially doing openshift/os#799 we'll also want to have this change for OCP/RHEL.

That said, I think the Live ISO case is going to have interesting issues here. What we probably want to support is a case where we do dynamic overlays of things like kubelet and other tools, without a reboot.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, that script would fail on any LiveISO, but we run boostrap-pivot on OKD only. The CentOS guard here is because OKD SCOS can start via:

  • FCOS in IPI
  • LiveISO SCOS in Assisted Installer

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but I'm saying we're at least potentially going to make the same change for OCP to ship disk images that are pure RHEL content. (enhancement etc. to be written; no action required now, just noting)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes, in that case we'll need something similar - and it would be a great opportunity to rework bootstrap-pivot entirely

touch /opt/openshift/.pivot-done
exit 0
fi
{{end -}}

# Rebase to OKD's OSTree container image.
# This is required in OKD as the node is first provisioned with plain Fedora CoreOS.

Expand Down