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.

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

Use macOS Sonoma images by default, instead of macOS Ventura #166

Merged
merged 1 commit into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ task:
labels:
name: dev-mini
pull_script:
- tart pull ghcr.io/cirruslabs/macos-ventura-base:latest
- tart pull ghcr.io/cirruslabs/macos-sonoma-base:latest
test_script:
- go test -v ./...
always:
Expand Down
4 changes: 2 additions & 2 deletions IntegrationGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def main():
# Create VM
response = requests.post("http://127.0.0.1:6120/v1/vms", auth=basic_auth, json={
"name": vm_name,
"image": "ghcr.io/cirruslabs/macos-ventura-base:latest",
"image": "ghcr.io/cirruslabs/macos-sonoma-base:latest",
"cpu": 4,
"memory": 4096,
"startup_script": {
Expand Down Expand Up @@ -146,7 +146,7 @@ func main() {
Meta: v1.Meta{
Name: vmName,
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 4096,
StartupScript: &v1.VMScript{
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For production deployments, please refer to the [Deployment Guide](./DeploymentG
Create a Virtual Machine resource:

```shell
orchard create vm --image ghcr.io/cirruslabs/macos-ventura-base:latest ventura-base
orchard create vm --image ghcr.io/cirruslabs/macos-sonoma-base:latest ventura-base
```

Check a list of VM resources to see if the Virtual Machine we've created above is already running:
Expand Down
2 changes: 1 addition & 1 deletion internal/command/create/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func newCreateVMCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
}

command.PersistentFlags().StringVar(&image, "image", "ghcr.io/cirruslabs/macos-ventura-base:latest", "image to use")
command.PersistentFlags().StringVar(&image, "image", "ghcr.io/cirruslabs/macos-sonoma-base:latest", "image to use")
command.PersistentFlags().Uint64Var(&cpu, "cpu", 4, "number of CPUs to use")
command.PersistentFlags().Uint64Var(&memory, "memory", 8*1024, "megabytes of memory to use")
command.PersistentFlags().BoolVar(&netSoftnet, "net-softnet", false, "whether to use Softnet network isolation")
Expand Down
16 changes: 8 additions & 8 deletions internal/tests/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestSingleVM(t *testing.T) {
Meta: v1.Meta{
Name: "test-vm",
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -113,7 +113,7 @@ func TestFailedStartupScript(t *testing.T) {
Meta: v1.Meta{
Name: "test-vm",
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -213,7 +213,7 @@ func TestPortForwarding(t *testing.T) {
Meta: v1.Meta{
Name: "test-vm",
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -293,7 +293,7 @@ func TestSchedulerHealthCheckingNonExistentWorker(t *testing.T) {
Meta: v1.Meta{
Name: dummyVMName,
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -368,7 +368,7 @@ func TestSchedulerHealthCheckingOfflineWorker(t *testing.T) {
Meta: v1.Meta{
Name: dummyVMName,
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -408,7 +408,7 @@ func TestVMGarbageCollection(t *testing.T) {
// Create on-disk Tart VM that looks like it's managed by Orchard
vmName := ondiskname.New("test", uuid.New().String(), 0).String()
_, _, err = tart.Tart(ctx, logger.Sugar(), "clone",
"ghcr.io/cirruslabs/macos-ventura-base:latest", vmName)
"ghcr.io/cirruslabs/macos-sonoma-base:latest", vmName)
require.NoError(t, err)

// Make sure that this VM exists
Expand Down Expand Up @@ -444,7 +444,7 @@ func TestHostDirs(t *testing.T) {
Meta: v1.Meta{
Name: vmName,
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down Expand Up @@ -507,7 +507,7 @@ func TestHostDirsInvalidPolicy(t *testing.T) {
Meta: v1.Meta{
Name: vmName,
},
Image: "ghcr.io/cirruslabs/macos-ventura-base:latest",
Image: "ghcr.io/cirruslabs/macos-sonoma-base:latest",
CPU: 4,
Memory: 8 * 1024,
Headless: true,
Expand Down
2 changes: 1 addition & 1 deletion internal/worker/ondiskname/ondiskname_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ func TestOnDiskNameNonUUID(t *testing.T) {
}

func TestOnDiskNameNonOrchard(t *testing.T) {
_, err := ondiskname.Parse("ghcr.io/cirruslabs/macos-ventura-base:latest")
_, err := ondiskname.Parse("ghcr.io/cirruslabs/macos-sonoma-base:latest")
require.Error(t, err)
}