Skip to content

Commit

Permalink
postinstall: use new qemu packaging
Browse files Browse the repository at this point in the history
Switch to the new qemu packaging method which doesn't include lima, since
we now use separate lima releases.

Signed-off-by: Mark Yen <mark.yen@suse.com>
  • Loading branch information
mook-as committed Oct 11, 2024
1 parent 6c36300 commit c26f611
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 35 deletions.
2 changes: 1 addition & 1 deletion pkg/rancher-desktop/assets/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lima: 0.21.0.rd2
limaAndQemu: 1.31.3
qemu: 0.0.0.20241009
socketVMNet: 1.1.5
alpineLimaISO:
isoVersion: 0.2.39.rd4
Expand Down
35 changes: 9 additions & 26 deletions scripts/dependencies/lima.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { download, downloadTarGZ, getResource } from '../lib/download';
import {
DownloadContext, Dependency, AlpineLimaISOVersion, findChecksum, getOctokit, GitHubDependency, getPublishedReleaseTagNames, GitHubRelease,
} from 'scripts/lib/dependencies';
import { simpleSpawn } from 'scripts/simple_process';

/**
* rcompareVersions implementation for version strings that look like 0.1.2.rd3????.
Expand Down Expand Up @@ -140,44 +141,26 @@ export class Lima implements Dependency, GitHubDependency {
}
}

export class LimaAndQemu implements Dependency, GitHubDependency {
name = 'limaAndQemu';
githubOwner = 'rancher-sandbox';
githubRepo = 'lima-and-qemu';
export class Qemu implements Dependency, GitHubDependency {
name = 'qemu';
githubOwner = 'mook-as';
githubRepo = 'qemu-packaging';

async download(context: DownloadContext): Promise<void> {
const baseUrl = `https://github.com/${ this.githubOwner }/${ this.githubRepo }/releases/download`;
let platform: string = context.platform;
const arch = context.isM1 ? 'aarch64' : 'x86_64';

if (platform === 'darwin') {
platform = 'macos';
if (process.env.M1) {
platform = `macos-aarch64`;
}
}
const url = `${ baseUrl }/v${ context.versions.limaAndQemu }/lima-and-qemu.${ platform }.tar.gz`;
const url = `${ baseUrl }/v${ context.versions.qemu }/qemu-${context.platform }-${ arch }.tar.gz`;

Check warning on line 153 in scripts/dependencies/lima.ts

View workflow job for this annotation

GitHub Actions / test

Expected space(s) after '${'

Check warning on line 153 in scripts/dependencies/lima.ts

View workflow job for this annotation

GitHub Actions / lint (macos-latest)

Expected space(s) after '${'
const expectedChecksum = (await getResource(`${ url }.sha512sum`)).split(/\s+/)[0];
const limaDir = path.join(context.resourcesDir, context.platform, 'lima');
const tarPath = path.join(context.resourcesDir, context.platform, `lima-and-qemu.v${ context.versions.limaAndQemu }.tgz`);
const tarPath = path.join(context.resourcesDir, context.platform, `qemu.v${ context.versions.qemu }.tgz`);

await download(url, tarPath, {
expectedChecksum, checksumAlgorithm: 'sha512', access: fs.constants.W_OK,
});
await fs.promises.mkdir(limaDir, { recursive: true });

const child = childProcess.spawn('/usr/bin/tar',
['-xf', tarPath, '--exclude', 'lima*', '--exclude', 'vde/bin', '--exclude', 'vde/lib', '--exclude', 'socket_vmnet'],
{ cwd: limaDir, stdio: 'inherit' });

await new Promise<void>((resolve, reject) => {
child.on('exit', (code, signal) => {
if (code === 0) {
resolve();
} else {
reject(new Error(`Lima-and-QEMU extract failed with ${ code || signal }`));
}
});
});
await simpleSpawn('/usr/bin/tar', ['-xf', tarPath], { cwd: limaDir });
}

async getAvailableVersions(): Promise<string[]> {
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export type AlpineLimaISOVersion = {

export type DependencyVersions = {
lima: string;
limaAndQemu: string;
qemu: string;
socketVMNet: string;
alpineLimaISO: AlpineLimaISOVersion;
WSLDistro: string;
Expand Down
6 changes: 3 additions & 3 deletions scripts/postinstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import os from 'os';
import path from 'path';

import * as goUtils from 'scripts/dependencies/go-source';
import { Lima, LimaAndQemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
import { MobyOpenAPISpec } from 'scripts/dependencies/moby-openapi';
import { SudoPrompt } from 'scripts/dependencies/sudo-prompt';
import { ExtensionProxyImage, WSLDistroImage } from 'scripts/dependencies/tar-archives';
Expand Down Expand Up @@ -43,7 +43,7 @@ const userTouchedDependencies = [
// Dependencies that are specific to unix hosts.
const unixDependencies = [
new Lima(),
new LimaAndQemu(),
new Qemu(),
new AlpineLimaISO(),
];

Expand Down Expand Up @@ -147,7 +147,7 @@ async function downloadDependencies(items: DependencyWithContext[]): Promise<voi
});
const pending = Array.from(running).filter(v => !done.has(v));

await Promise.any([timeout, ...pending.map(v => promises[v])]);
await Promise.race([timeout, ...pending.map(v => promises[v])]);
}
abortSignal.onabort = null;

Expand Down
4 changes: 2 additions & 2 deletions scripts/rddepman.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import path from 'path';

import { Octokit } from 'octokit';

import { Lima, LimaAndQemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
import { MobyOpenAPISpec } from 'scripts/dependencies/moby-openapi';
import * as tools from 'scripts/dependencies/tools';
import { Wix } from 'scripts/dependencies/wix';
Expand Down Expand Up @@ -38,7 +38,7 @@ const dependencies: Dependency[] = [
new tools.RancherDashboard(),
new tools.ECRCredHelper(),
new Lima(),
new LimaAndQemu(),
new Qemu(),
new SocketVMNet(),
new AlpineLimaISO(),
new WSLDistro(),
Expand Down
4 changes: 2 additions & 2 deletions scripts/unreleased-change-monitor.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Octokit } from 'octokit';

import { Lima, LimaAndQemu, AlpineLimaISO } from 'scripts/dependencies/lima';
import { Lima, Qemu, AlpineLimaISO } from 'scripts/dependencies/lima';
import * as tools from 'scripts/dependencies/tools';
import { WSLDistro } from 'scripts/dependencies/wsl';
import {
Expand All @@ -20,7 +20,7 @@ type DependencyState = { dependency: UnreleasedChangeMonitoringDependency } & Ha

const dependencies: UnreleasedChangeMonitoringDependency[] = [
new Lima(),
new LimaAndQemu(),
new Qemu(),
new WSLDistro(),
new tools.DockerCLI(),
new tools.Steve(),
Expand Down

0 comments on commit c26f611

Please sign in to comment.