diff --git a/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden b/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden index 02dbed4aa..67f49da81 100644 --- a/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden @@ -25,7 +25,6 @@ ARGS: [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3) DEPRECATED ARGS: - [default-bootscript] Default bootscript of the image [additional-volumes.{index}.organization-id] Organization ID that own the additional snapshot FLAGS: diff --git a/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden b/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden index 1d55aaa3a..fbf1d4003 100644 --- a/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden @@ -44,7 +44,6 @@ ARGS: [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3) DEPRECATED ARGS: - [bootscript] [routed-ip-enabled] True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False) [enable-ipv6] diff --git a/docs/commands/instance.md b/docs/commands/instance.md index db1048536..f4571823a 100644 --- a/docs/commands/instance.md +++ b/docs/commands/instance.md @@ -134,7 +134,6 @@ scw instance image create [arg=value ...] | name | Default: `` | Name of the image | | snapshot-id | Required | UUID of the snapshot that will be used as root volume in the image | | arch | Required
One of: `unknown_arch`, `x86_64`, `arm`, `arm64` | Architecture of the image | -| ~~default-bootscript~~ | Deprecated | Default bootscript of the image | | additional-volumes.{index}.id | | UUID of the snapshot to add | | additional-volumes.{index}.name | | Name of the additional snapshot | | additional-volumes.{index}.size | | Size of the additional snapshot | @@ -2271,7 +2270,6 @@ scw instance server update [arg=value ...] | volumes.{key}.base-snapshot | | ID of the snapshot on which this volume will be based | | volumes.{key}.project | | Project ID of the volume | | volumes.{key}.organization | | Organization ID of the volume | -| ~~bootscript~~ | Deprecated | | | dynamic-ip-required | | | | ~~routed-ip-enabled~~ | Deprecated | True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False) | | public-ips.{index} | | A list of reserved IP IDs to attach to the Instance | diff --git a/go.mod b/go.mod index a56cf27f8..2d66ee736 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/mattn/go-isatty v0.0.20 github.com/moby/buildkit v0.13.2 github.com/opencontainers/go-digest v1.0.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 9bdef176d..3eb7673e5 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092 h1:ZGeS/9T7KyEpAFpalrS2PZR6zxIOV316VTyqGF4/8EQ= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0 h1:bykODWS911XOzQZ+WfJ2NmWmFcB0Iuod5+brNIUeNqE= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA= diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden b/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden index 2e2eb3184..0affac802 100644 --- a/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden +++ b/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden @@ -47,7 +47,6 @@ PublicIPs.0.State attached MacAddress de:00:00:40:b0:af ModificationDate few seconds ago State archived -Bootscript x86_64 mainline 4.4.230 rev1 BootType local Volumes.0.ID 08424d6f-cf09-4498-94b5-042ef6eb38f1 Volumes.0.Name Ubuntu Jammy GPU OS 12 passthrough @@ -152,20 +151,6 @@ Zone fr-par-2 "state": "stopped", "location": null, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "e6a56379-9ef4-48d4-a1d2-12b475e0fed8", - "initrd": "http://10.197.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://10.197.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-2" - }, "boot_type": "local", "volumes": { "0": { diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden b/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden index 38b900850..16c521a01 100644 --- a/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden +++ b/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden @@ -47,7 +47,6 @@ PublicIPs.0.State attached MacAddress de:00:00:5f:a1:a7 ModificationDate few seconds ago State archived -Bootscript x86_64 mainline 4.4.230 rev1 BootType local Volumes.0.ID b2a541e6-cd3a-418d-9cb2-c3e10ae4b3f3 Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish @@ -139,20 +138,6 @@ Zone fr-par-1 "state": "stopped", "location": null, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1", - "initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-1" - }, "boot_type": "local", "volumes": { "0": { diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden b/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden index 1451df42e..376331d1f 100644 --- a/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden +++ b/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden @@ -23,7 +23,6 @@ PublicIP.State attached MacAddress de:00:00:5f:a2:f1 ModificationDate few seconds ago State archived -Bootscript x86_64 mainline 4.4.230 rev1 BootType local SecurityGroup.ID 0fe819c3-274d-472a-b3f5-ddb258d2d8bb SecurityGroup.Name Default security group @@ -134,20 +133,6 @@ ID MAC ADDRESS PRIVATE NETWORK NAME PRIVATE NETWORK ID "state": "stopped", "location": null, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1", - "initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-1" - }, "boot_type": "local", "volumes": { "0": { diff --git a/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden b/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden index 8bd682866..04c075019 100644 --- a/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden +++ b/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden @@ -51,7 +51,6 @@ MacAddress de:00:00:5f:a1:03 ModificationDate few seconds ago State running Location fr-par-1 -Bootscript x86_64 mainline 4.4.230 rev1 BootType local Volumes.0.ID 2c0392b4-a294-46d8-a393-39f4bfacf77f Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish @@ -152,20 +151,6 @@ Zone fr-par-1 "zone_id": "par1" }, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1", - "initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-1" - }, "boot_type": "local", "volumes": { "0": { diff --git a/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden b/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden index 4e170676e..981741480 100644 --- a/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden +++ b/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden @@ -23,6 +23,7 @@ Image.Zone fr-par-1 "creation_date": "1970-01-01T00:00:00.0Z", "modification_date": "1970-01-01T00:00:00.0Z", "default_bootscript": { + "architecture": "x86_64", "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", "default": true, "dtb": "", @@ -30,10 +31,9 @@ Image.Zone fr-par-1 "initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", "kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", "public": true, "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", + "project": "11111111-1111-4111-8111-111111111111", "zone": "fr-par-1" }, "extra_volumes": {}, diff --git a/internal/namespaces/instance/v1/testdata/test-server-enable-routed-ip-simple.golden b/internal/namespaces/instance/v1/testdata/test-server-enable-routed-ip-simple.golden index 263ebf944..6654a86da 100644 --- a/internal/namespaces/instance/v1/testdata/test-server-enable-routed-ip-simple.golden +++ b/internal/namespaces/instance/v1/testdata/test-server-enable-routed-ip-simple.golden @@ -51,7 +51,6 @@ MacAddress de:00:00:12:5a:4b ModificationDate few seconds ago State running Location fr-par-3 -Bootscript x86_64 mainline 4.4.230 rev1 BootType local Volumes.0.ID 8c935774-18e4-4747-8765-820399eaaab8 Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish @@ -152,20 +151,6 @@ Zone fr-par-3 "zone_id": "fr-par-3" }, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "346edd9d-a17a-45f5-b2ac-bbf282c3ce3c", - "initrd": "http://169.254.42.24/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://169.254.42.24/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-3" - }, "boot_type": "local", "volumes": { "0": { diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden b/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden index f1a6f232c..8ec82167c 100644 --- a/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden +++ b/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden @@ -47,7 +47,6 @@ Server.PublicIPs.0.State attached Server.MacAddress de:00:00:5f:a3:0d Server.ModificationDate few seconds ago Server.State archived -Server.Bootscript x86_64 mainline 4.4.230 rev1 Server.BootType local Server.Volumes.0.ID 5af49971-524e-4cc5-9919-55824de6a87b Server.Volumes.0.Name Ubuntu 18.04 Bionic Beaver @@ -140,20 +139,6 @@ Server.Zone fr-par-1 "state": "stopped", "location": null, "ipv6": null, - "bootscript": { - "bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16", - "default": true, - "dtb": "", - "id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1", - "initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz", - "kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230", - "organization": "11111111-1111-4111-8111-111111111111", - "project": "11111111-1111-4111-8111-111111111111", - "public": true, - "title": "x86_64 mainline 4.4.230 rev1", - "architecture": "x86_64", - "zone": "fr-par-1" - }, "boot_type": "local", "volumes": { "0": {