Skip to content

fix(control-plane): tolerate non-EC2 apt sources #33

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

Open
brandonhresko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(control-plane): tolerate non-EC2 apt sources #33

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/control-plane/core/bootstrap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ APTCONF
# rewrite before the first update, or the package lists are silently incomplete and
# the docker.io install fails later for a reason that looks unrelated.
ec2_mirror=$(grep -rhoE 'https?://[a-z0-9-]+\.ec2\.archive\.ubuntu\.com' \
/etc/apt/sources.list /etc/apt/sources.list.d/ 2>/dev/null | head -1)
/etc/apt/sources.list /etc/apt/sources.list.d/ 2>/dev/null | head -1 || true)
if [ -n "$ec2_mirror" ] && ! curl -fsS -m 10 -o /dev/null "$ec2_mirror/ubuntu/dists/noble/InRelease"; then
echo "blitz: $ec2_mirror is unreachable; falling back to archive.ubuntu.com"
sed -i -E 's|https?://[a-z0-9-]+\.ec2\.archive\.ubuntu\.com|http://archive.ubuntu.com|g' \
Expand Down
1 change: 1 addition & 0 deletions packages/control-plane/test/bootstrap.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ describe("production VM bootstrap", () => {
const userData = registryUserData();

expect(userData).toContain("apt_watchdog install -y docker.io curl");
expect(userData).toContain("2>/dev/null | head -1 || true)");
expect(userData).toContain("systemctl enable --now docker");
expect(userData).toContain("/dev/disk/by-id/scsi-0HC_Volume_*");
expect(userData).toContain("/var/lib/blitz/authorized_key");
Expand Down
Loading