diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden index fab84898d4..16129a3a03 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden @@ -34,7 +34,7 @@ ARGS: [pools.{index}.upgrade-policy.max-unavailable] The maximum number of nodes that can be not ready at the same time [pools.{index}.upgrade-policy.max-surge] The maximum number of nodes to be created during the upgrade [pools.{index}.zone] Zone in which the pool's nodes will be spawned - [pools.{index}.root-volume-type] Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster (default_volume_type | l_ssd | b_ssd) + [pools.{index}.root-volume-type] Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster (default_volume_type | l_ssd | b_ssd | sbs_5k | sbs_15k) [pools.{index}.root-volume-size] System volume disk size [pools.{index}.public-ip-disabled] Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway [autoscaler-config.scale-down-disabled] Disable the cluster autoscaler diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden index a8f9266c58..a4e520cbaa 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden @@ -31,7 +31,7 @@ ARGS: [upgrade-policy.max-unavailable] [upgrade-policy.max-surge] [zone] Zone in which the pool's nodes will be spawned - [root-volume-type] Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster (default_volume_type | l_ssd | b_ssd) + [root-volume-type] Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster (default_volume_type | l_ssd | b_ssd | sbs_5k | sbs_15k) [root-volume-size] System volume disk size [public-ip-disabled] Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) diff --git a/docs/commands/k8s.md b/docs/commands/k8s.md index d96e12a7da..e50d9a2969 100644 --- a/docs/commands/k8s.md +++ b/docs/commands/k8s.md @@ -98,7 +98,7 @@ scw k8s cluster create [arg=value ...] | pools.{index}.upgrade-policy.max-unavailable | | The maximum number of nodes that can be not ready at the same time | | pools.{index}.upgrade-policy.max-surge | | The maximum number of nodes to be created during the upgrade | | pools.{index}.zone | | Zone in which the pool's nodes will be spawned | -| pools.{index}.root-volume-type | One of: `default_volume_type`, `l_ssd`, `b_ssd` | Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster | +| pools.{index}.root-volume-type | One of: `default_volume_type`, `l_ssd`, `b_ssd`, `sbs_5k`, `sbs_15k` | Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster | | pools.{index}.root-volume-size | | System volume disk size | | pools.{index}.public-ip-disabled | | Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway | | autoscaler-config.scale-down-disabled | | Disable the cluster autoscaler | @@ -904,7 +904,7 @@ scw k8s pool create [arg=value ...] | upgrade-policy.max-unavailable | | | | upgrade-policy.max-surge | | | | zone | | Zone in which the pool's nodes will be spawned | -| root-volume-type | One of: `default_volume_type`, `l_ssd`, `b_ssd` | Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster | +| root-volume-type | One of: `default_volume_type`, `l_ssd`, `b_ssd`, `sbs_5k`, `sbs_15k` | Defines the system volume disk type. Two different types of volume (`volume_type`) are provided: `l_ssd` is a local block storage which means your system is stored locally on your node's hypervisor. `b_ssd` is a remote block storage which means your system is stored on a centralized and resilient cluster | | root-volume-size | | System volume disk size | | public-ip-disabled | | Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway | | region | Default: `fr-par`
One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config | diff --git a/go.mod b/go.mod index a48f792b1b..4c2d585c44 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.20241104173714-b6b9e5455a0e + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241106130909-59f12be02260 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 0b850e3203..ce44d847eb 100644 --- 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.30.0.20241104173714-b6b9e5455a0e h1:BKhmO3BK1mI9K1DFjLHxOa7dSETU2QWksMhfUAmfJLU= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241104173714-b6b9e5455a0e/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241106130909-59f12be02260 h1:kTm4nU1Z4NMDqWBU2EuF+KEKFUFhpx+ded0gAtG8zfg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241106130909-59f12be02260/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/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go index a5a395f777..67a51a4143 100644 --- a/internal/namespaces/k8s/v1/k8s_cli.go +++ b/internal/namespaces/k8s/v1/k8s_cli.go @@ -418,7 +418,7 @@ func k8sClusterCreate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"default_volume_type", "l_ssd", "b_ssd"}, + EnumValues: []string{"default_volume_type", "l_ssd", "b_ssd", "sbs_5k", "sbs_15k"}, }, { Name: "pools.{index}.root-volume-size", @@ -1456,7 +1456,7 @@ func k8sPoolCreate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"default_volume_type", "l_ssd", "b_ssd"}, + EnumValues: []string{"default_volume_type", "l_ssd", "b_ssd", "sbs_5k", "sbs_15k"}, }, { Name: "root-volume-size",