Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 640ea2c73aa1 · 2025-07-17T13:10:35.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ scw-cli-v2-version
 # To avoid having differences in case you use a different shell than bash while recording the goldens
 docs/commands/autocomplete.md
 
-scw
+# Ignore the binary
+/scw
diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-migrate-to-new-images-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-pool-migrate-to-new-images-usage.golden
@@ -0,0 +1,27 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+If no pool is specified, all pools of the cluster will be migrated to new images.
+
+USAGE:
+  scw k8s pool migrate-to-new-images [arg=value ...]
+
+EXAMPLES:
+  Migrate all pools of a cluster to new images
+    scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111
+
+  Migrate a specific pool of a cluster to new images
+    scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111 pools.0=22222222-2222-2222-2222-222222222222
+
+ARGS:
+  cluster-id           
+  [pool-ids.{index}]   
+  [region=fr-par]      Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for migrate-to-new-images
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden
@@ -7,16 +7,17 @@ USAGE:
   scw k8s pool <command>
 
 AVAILABLE COMMANDS:
-  add-external-node Add an external node to a Kosmos Pool
-  create            Create a new Pool in a Cluster
-  delete            Delete a Pool in a Cluster
-  get               Get a Pool in a Cluster
-  list              List Pools in a Cluster
-  update            Update a Pool in a Cluster
-  upgrade           Upgrade a Pool in a Cluster
+  add-external-node     Add an external node to a Kosmos Pool
+  create                Create a new Pool in a Cluster
+  delete                Delete a Pool in a Cluster
+  get                   Get a Pool in a Cluster
+  list                  List Pools in a Cluster
+  migrate-to-new-images Migrate specific pools or all pools of a cluster to new images.
+  update                Update a Pool in a Cluster
+  upgrade               Upgrade a Pool in a Cluster
 
 WORKFLOW COMMANDS:
-  wait              Wait for a pool to reach a stable state
+  wait                  Wait for a pool to reach a stable state
 
 FLAGS:
   -h, --help   help for pool
diff --git a/docs/commands/k8s.md b/docs/commands/k8s.md
@@ -38,6 +38,7 @@ This API allows you to manage Kubernetes Kapsule and Kosmos clusters.
   - [Delete a Pool in a Cluster](#delete-a-pool-in-a-cluster)
   - [Get a Pool in a Cluster](#get-a-pool-in-a-cluster)
   - [List Pools in a Cluster](#list-pools-in-a-cluster)
+  - [Migrate specific pools or all pools of a cluster to new images.](#migrate-specific-pools-or-all-pools-of-a-cluster-to-new-images.)
   - [Update a Pool in a Cluster](#update-a-pool-in-a-cluster)
   - [Upgrade a Pool in a Cluster](#upgrade-a-pool-in-a-cluster)
   - [Wait for a pool to reach a stable state](#wait-for-a-pool-to-reach-a-stable-state)
@@ -1121,6 +1122,42 @@ scw k8s pool list cluster-id=11111111-1111-1111-1111-111111111111 order-by=creat
 
 
 
+### Migrate specific pools or all pools of a cluster to new images.
+
+If no pool is specified, all pools of the cluster will be migrated to new images.
+
+**Usage:**
+
+```
+scw k8s pool migrate-to-new-images [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| cluster-id | Required |  |
+| pool-ids.{index} |  |  |
+| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
+
+
+**Examples:**
+
+
+Migrate all pools of a cluster to new images
+```
+scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111
+```
+
+Migrate a specific pool of a cluster to new images
+```
+scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111 pools.0=22222222-2222-2222-2222-222222222222
+```
+
+
+
+
 ### Update a Pool in a Cluster
 
 Update the attributes of a specific pool, such as its desired size, autoscaling settings, and tags. To upgrade a pool, you will need to use the dedicated endpoint.
diff --git a/go.mod b/go.mod
@@ -23,10 +23,10 @@ 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.33.0.20250630080509-bd2b86613e39
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.40.0
 	golang.org/x/sync v0.16.0
diff --git a/go.sum b/go.sum
@@ -466,8 +466,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.33.0.20250630080509-bd2b86613e39 h1:Xean40tUO2sN0pODaLwh+wLz5NYI578PPVIFJgob7cM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250630080509-bd2b86613e39/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66 h1:cdds9CiMBdb9rLJ9xlbTkCtCXfux41nxx3j6+qtCf0Q=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
 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=
@@ -493,8 +493,9 @@ github.com/spdx/tools-golang v0.5.3 h1:ialnHeEYUC4+hkm5vJm4qz2x+oEJbS0mAMFrNXdQr
 github.com/spdx/tools-golang v0.5.3/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
diff --git a/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden b/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden
@@ -14,6 +14,7 @@ Domain          -
 BootType        normal
 Zone            fr-par-2
 PingStatus      unknown
+Protected       false
 
 IPs:
 ID                                    ADDRESS                                REVERSE  VERSION  REVERSE STATUS  REVERSE STATUS MESSAGE
@@ -59,5 +60,6 @@ ID   NAME  STATUS  MANAGEABLE  EXPIRES AT
   "install": null,
   "ping_status": "ping_status_unknown",
   "options": [],
-  "rescue_server": null
+  "rescue_server": null,
+  "protected": false
 }
diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden b/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden
@@ -14,6 +14,7 @@ Domain          94f3192e-3a74-4a78-8d78-33047c5aa28c.fr-par-2.baremetal.scw.clou
 BootType        normal
 Zone            fr-par-2
 PingStatus      unknown
+Protected       false
 
 IPs:
 ID                                    ADDRESS                                REVERSE                                                            VERSION  REVERSE STATUS  REVERSE STATUS MESSAGE
@@ -249,5 +250,6 @@ PartitioningSchema.Filesystems.2.Mountpoint                   /
   },
   "ping_status": "ping_status_unknown",
   "options": [],
-  "rescue_server": null
+  "rescue_server": null,
+  "protected": false
 }
diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden b/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden
@@ -14,6 +14,7 @@ Domain          4741beac-6994-4ae2-8ced-bb8a05790a06.fr-par-2.baremetal.scw.clou
 BootType        normal
 Zone            fr-par-2
 PingStatus      unknown
+Protected       false
 
 IPs:
 ID                                    ADDRESS                                REVERSE                                                            VERSION  REVERSE STATUS  REVERSE STATUS MESSAGE
@@ -219,5 +220,6 @@ PartitioningSchema.Filesystems.2.Mountpoint                   /
   },
   "ping_status": "ping_status_unknown",
   "options": [],
-  "rescue_server": null
+  "rescue_server": null,
+  "protected": false
 }
diff --git a/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden b/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden
@@ -42,6 +42,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551  cli-bm-friendly-brahmagupta  EM-I215E-NVME
     "ping_status": "ping_status_up",
     "options": [],
     "rescue_server": null,
+    "protected": false,
     "offer_name": "EM-I215E-NVME"
   },
   {
@@ -193,6 +194,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551  cli-bm-friendly-brahmagupta  EM-I215E-NVME
     "ping_status": "ping_status_unknown",
     "options": [],
     "rescue_server": null,
+    "protected": false,
     "offer_name": "EM-I215E-NVME"
   },
   {
@@ -335,6 +337,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551  cli-bm-friendly-brahmagupta  EM-I215E-NVME
     "ping_status": "ping_status_unknown",
     "options": [],
     "rescue_server": null,
+    "protected": false,
     "offer_name": "EM-I215E-NVME"
   }
 ]
diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go
@@ -46,6 +46,7 @@ func GetGeneratedCommands() *core.Commands {
 		k8sPoolUpgrade(),
 		k8sPoolUpdate(),
 		k8sPoolDelete(),
+		k8sPoolMigrateToNewImages(),
 		k8sNodeList(),
 		k8sNodeGet(),
 		k8sNodeReplace(),
@@ -2086,6 +2087,62 @@ func k8sPoolDelete() *core.Command {
 	}
 }
 
+func k8sPoolMigrateToNewImages() *core.Command {
+	return &core.Command{
+		Short:     `Migrate specific pools or all pools of a cluster to new images.`,
+		Long:      `If no pool is specified, all pools of the cluster will be migrated to new images.`,
+		Namespace: "k8s",
+		Resource:  "pool",
+		Verb:      "migrate-to-new-images",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(k8s.MigratePoolsToNewImagesRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "cluster-id",
+				Required:   true,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "pool-ids.{index}",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.RegionArgSpec(
+				scw.RegionFrPar,
+				scw.RegionNlAms,
+				scw.RegionPlWaw,
+			),
+		},
+		Run: func(ctx context.Context, args any) (i any, e error) {
+			request := args.(*k8s.MigratePoolsToNewImagesRequest)
+
+			client := core.ExtractClient(ctx)
+			api := k8s.NewAPI(client)
+			e = api.MigratePoolsToNewImages(request)
+			if e != nil {
+				return nil, e
+			}
+
+			return &core.SuccessResult{
+				Resource: "pool",
+				Verb:     "migrate-to-new-images",
+			}, nil
+		},
+		Examples: []*core.Example{
+			{
+				Short: "Migrate all pools of a cluster to new images",
+				Raw:   `scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111`,
+			},
+			{
+				Short: "Migrate a specific pool of a cluster to new images",
+				Raw:   `scw k8s pool migrate-to-new-images cluster-id=11111111-1111-1111-1111-111111111111 pools.0=22222222-2222-2222-2222-222222222222`,
+			},
+		},
+	}
+}
+
 func k8sNodeList() *core.Command {
 	return &core.Command{
 		Short:     `List Nodes in a Cluster`,

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551 cli-bm-friendly-brahmagupta EM-I215E-NVME`
`42`	`42`	`"ping_status": "ping_status_up",`
`43`	`43`	`"options": [],`
`44`	`44`	`"rescue_server": null,`
	`45`	`+ "protected": false,`
`45`	`46`	`"offer_name": "EM-I215E-NVME"`
`46`	`47`	`},`
`47`	`48`	`{`
`@@ -193,6 +194,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551 cli-bm-friendly-brahmagupta EM-I215E-NVME`
`193`	`194`	`"ping_status": "ping_status_unknown",`
`194`	`195`	`"options": [],`
`195`	`196`	`"rescue_server": null,`
	`197`	`+ "protected": false,`
`196`	`198`	`"offer_name": "EM-I215E-NVME"`
`197`	`199`	`},`
`198`	`200`	`{`
`@@ -335,6 +337,7 @@ e54658ca-e08d-473a-aad1-d3f31a8a5551 cli-bm-friendly-brahmagupta EM-I215E-NVME`
`335`	`337`	`"ping_status": "ping_status_unknown",`
`336`	`338`	`"options": [],`
`337`	`339`	`"rescue_server": null,`
	`340`	`+ "protected": false,`
`338`	`341`	`"offer_name": "EM-I215E-NVME"`
`339`	`342`	`}`
`340`	`343`	`]`