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

Add experimental options for vm-type and use-rosetta #4063

Merged
merged 11 commits into from
Mar 11, 2023
Merged

Add experimental options for vm-type and use-rosetta #4063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f2b4633
Don't try to stop cleanly when we are deleting the vm anyways
jandubois Mar 3, 2023
d3779bf
Create non-admin lima.yaml when not using admin credentials
jandubois Mar 3, 2023
75bc07d
Add com.apple.security.virtualization entitlement
jandubois Mar 3, 2023
b01a2d6
Add experimental vm.type=vz and vm.use-rosetta options
jandubois Mar 2, 2023
6fb16bc
Factor out spawnWithCapture to implement limaWithCapture
jandubois Mar 7, 2023
c65fc1a
Convert diffdisk from qcow2 to raw format
jandubois Mar 7, 2023
4ea6954
macOS Ventura is using darwin 22.1.0
jandubois Mar 10, 2023
239c63f
Add MountType "virtiofs" for VMType "vz"
jandubois Mar 11, 2023
a08caae
Remove redundant quotes in command-api.yaml
jandubois Mar 11, 2023
54ce4fa
Fix virtual-machine.vm-type → virtual-machine.type
jandubois Mar 11, 2023
d2f795b
Remove useless IIFEs
jandubois Mar 11, 2023
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
4 changes: 0 additions & 4 deletions background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,13 +568,9 @@ async function doK8sReset(arg: 'fast' | 'wipe' | 'fullRestart', context: Command
await startK8sManager();
break;
case 'wipe':
await k8smanager.stop();

console.log(`Stopped Kubernetes backend cleanly.`);
console.log('Deleting VM to reset...');
await k8smanager.del();
console.log(`Deleted VM to reset exited cleanly.`);

await startK8sManager();
break;
}
Expand Down
4 changes: 3 additions & 1 deletion build/entitlements.mac.inherit.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@
<true/>
<key>com.apple.security.hypervisor</key>
<true/>
<key>com.apple.security.virtualization</key>
<true/>
</dict>
</plist>
</plist>
2 changes: 2 additions & 0 deletions build/entitlements.mac.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<true/>
<key>com.apple.security.hypervisor</key>
<true/>
<key>com.apple.security.virtualization</key>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions e2e/rdctl.e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
CacheMode,
ProtocolVersion,
SecurityModel,
VMType,
} from '@pkg/config/settings';
import { PathManagementStrategy } from '@pkg/integrations/pathManager';
import { ServerState } from '@pkg/main/commandServer/httpCommandServer';
Expand Down Expand Up @@ -707,6 +708,8 @@ test.describe('Command server', () => {
['experimental.virtual-machine.mount.9p.security-model', SecurityModel.NONE],
['experimental.virtual-machine.mount.type', MountType.NINEP],
jandubois marked this conversation as resolved.
Show resolved Hide resolved
['experimental.virtual-machine.socket-vmnet', true],
['experimental.virtual-machine.use-rosetta', true],
['experimental.virtual-machine.type', VMType.VZ],
['virtual-machine.memory-in-gb', 10],
['virtual-machine.number-cpus', 10],
],
Expand All @@ -715,6 +718,8 @@ test.describe('Command server', () => {
],
linux: [
['experimental.virtual-machine.socket-vmnet', true],
['experimental.virtual-machine.use-rosetta', true],
['experimental.virtual-machine.type', VMType.VZ],
['virtual-machine.host-resolver', true],
],
};
Expand Down
9 changes: 8 additions & 1 deletion pkg/rancher-desktop/assets/specs/command-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ components:
properties:
type:
type: string
enum: [reverse-sshfs, 9p]
enum: [reverse-sshfs, 9p, virtiofs]
jandubois marked this conversation as resolved.
Show resolved Hide resolved
x-rd-usage: how directories are shared
9p:
type: object
Expand All @@ -365,6 +365,13 @@ components:
type: boolean
x-rd-platforms: [win32]
x-rd-usage: tunnel networking so it originates from the host
type:
type: string
enum: [qemu, vz]
x-rd-platforms: [darwin]
useRosetta:
type: boolean
x-rd-platforms: [darwin]
WSL:
type: object
x-rd-platforms: [win32]
Expand Down
Loading