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 f2b5b35cba..fab84898d4 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 @@ -19,7 +19,7 @@ ARGS: [description] Cluster description [tags.{index}] Tags associated with the cluster version=latest Kubernetes version of the cluster - cni=cilium Container Network Interface (CNI) plugin running in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo) + cni=cilium Container Network Interface (CNI) plugin running in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo | none) [pools.{index}.name] Name of the pool [pools.{index}.node-type] Node type is the type of Scaleway Instance wanted for the pool. Nodes with insufficient memory are not eligible (DEV1-S, PLAY2-PICO, STARDUST). 'external' is a special node type used to provision instances from other cloud providers in a Kosmos Cluster [pools.{index}.placement-group-id] Placement group ID in which all the nodes of the pool will be created diff --git a/docs/commands/k8s.md b/docs/commands/k8s.md index 539e736cda..e00a93543a 100644 --- a/docs/commands/k8s.md +++ b/docs/commands/k8s.md @@ -68,7 +68,7 @@ scw k8s cluster create [arg=value ...] | description | | Cluster description | | tags.{index} | | Tags associated with the cluster | | version | Required
Default: `latest` | Kubernetes version of the cluster | -| cni | Required
Default: `cilium`
One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo` | Container Network Interface (CNI) plugin running in the cluster | +| cni | Required
Default: `cilium`
One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo`, `none` | Container Network Interface (CNI) plugin running in the cluster | | pools.{index}.name | | Name of the pool | | pools.{index}.node-type | | Node type is the type of Scaleway Instance wanted for the pool. Nodes with insufficient memory are not eligible (DEV1-S, PLAY2-PICO, STARDUST). 'external' is a special node type used to provision instances from other cloud providers in a Kosmos Cluster | | pools.{index}.placement-group-id | | Placement group ID in which all the nodes of the pool will be created | diff --git a/go.mod b/go.mod index 0f511738ec..04ebc8f34e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/moby/buildkit v0.11.6 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/errors v0.9.1 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240327151700-4f053a4f2844 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 4c3e7b6b9e..8f15d69639 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,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.25.0.20240327151700-4f053a4f2844 h1:zQjtAnoNVr7x5bX4mKElxxz8WPxvvPC2hzClKNR3utA= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240327151700-4f053a4f2844/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df h1:6GfqcKcUj896FRN7j5BnhL5+mtocxlsTQMqiqhOAn00= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= 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.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE= diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go index 246d2ac831..d3f7098423 100644 --- a/internal/namespaces/k8s/v1/k8s_cli.go +++ b/internal/namespaces/k8s/v1/k8s_cli.go @@ -301,7 +301,7 @@ func k8sClusterCreate() *core.Command { Required: true, Deprecated: false, Positional: false, - EnumValues: []string{"unknown_cni", "cilium", "calico", "weave", "flannel", "kilo"}, + EnumValues: []string{"unknown_cni", "cilium", "calico", "weave", "flannel", "kilo", "none"}, }, { Name: "pools.{index}.name",