Skip to content

Commit d56b230

Browse files
authored
feat(k8s): allow cluster with cni=none (#3730)
1 parent 4407d88 commit d56b230

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARGS:
1919
[description] Cluster description
2020
[tags.{index}] Tags associated with the cluster
2121
version=latest Kubernetes version of the cluster
22-
cni=cilium Container Network Interface (CNI) plugin running in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo)
22+
cni=cilium Container Network Interface (CNI) plugin running in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo | none)
2323
[pools.{index}.name] Name of the pool
2424
[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
2525
[pools.{index}.placement-group-id] Placement group ID in which all the nodes of the pool will be created

docs/commands/k8s.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ scw k8s cluster create [arg=value ...]
6868
| description | | Cluster description |
6969
| tags.{index} | | Tags associated with the cluster |
7070
| version | Required<br />Default: `latest` | Kubernetes version of the cluster |
71-
| cni | Required<br />Default: `cilium`<br />One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo` | Container Network Interface (CNI) plugin running in the cluster |
71+
| cni | Required<br />Default: `cilium`<br />One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo`, `none` | Container Network Interface (CNI) plugin running in the cluster |
7272
| pools.{index}.name | | Name of the pool |
7373
| 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 |
7474
| pools.{index}.placement-group-id | | Placement group ID in which all the nodes of the pool will be created |

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/moby/buildkit v0.11.6
2525
github.com/opencontainers/go-digest v1.0.0
2626
github.com/pkg/errors v0.9.1
27-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240327151700-4f053a4f2844
27+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df
2828
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2929
github.com/spf13/cobra v1.8.0
3030
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
425425
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
426426
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
427427
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
428-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240327151700-4f053a4f2844 h1:zQjtAnoNVr7x5bX4mKElxxz8WPxvvPC2hzClKNR3utA=
429-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240327151700-4f053a4f2844/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
428+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df h1:6GfqcKcUj896FRN7j5BnhL5+mtocxlsTQMqiqhOAn00=
429+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240328145934-63d5da1a64df/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
430430
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
431431
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
432432
github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=

internal/namespaces/k8s/v1/k8s_cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ func k8sClusterCreate() *core.Command {
301301
Required: true,
302302
Deprecated: false,
303303
Positional: false,
304-
EnumValues: []string{"unknown_cni", "cilium", "calico", "weave", "flannel", "kilo"},
304+
EnumValues: []string{"unknown_cni", "cilium", "calico", "weave", "flannel", "kilo", "none"},
305305
},
306306
{
307307
Name: "pools.{index}.name",

0 commit comments

Comments
 (0)