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 a131d94e67..1d481efa90 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 @@ -20,7 +20,6 @@ ARGS: [tags.{index}] The tags associated with the cluster version=latest The Kubernetes version of the cluster cni=cilium The Container Network Interface (CNI) plugin that will run in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo) - [ingress] The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2) pools.{index}.name The name of the pool pools.{index}.node-type The node type is the type of Scaleway Instance wanted for the pool [pools.{index}.placement-group-id] The placement group ID in which all the nodes of the pool will be created @@ -63,6 +62,7 @@ ARGS: DEPRECATED ARGS: [enable-dashboard] The enablement of the Kubernetes Dashboard in the cluster + [ingress] The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2) FLAGS: -h, --help help for create diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden index 006bd45378..dd653291e6 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden @@ -27,7 +27,6 @@ ARGS: [autoscaler-config.scale-down-unneeded-time] How long a node should be unneeded before it is eligible for scale down [autoscaler-config.scale-down-utilization-threshold] Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down [autoscaler-config.max-graceful-termination-sec] Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node - [ingress] The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2) [auto-upgrade.enable] Whether or not auto upgrade is enabled for the cluster [auto-upgrade.maintenance-window.start-hour] The start hour of the 2-hour maintenance window [auto-upgrade.maintenance-window.day] The day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday) @@ -45,6 +44,7 @@ ARGS: DEPRECATED ARGS: [enable-dashboard] The new value of the Kubernetes Dashboard enablement + [ingress] The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2) FLAGS: -h, --help help for update diff --git a/docs/commands/k8s.md b/docs/commands/k8s.md index b6f1da931d..79c6de2be7 100644 --- a/docs/commands/k8s.md +++ b/docs/commands/k8s.md @@ -66,7 +66,7 @@ scw k8s cluster create [arg=value ...] | version | Required
Default: `latest` | The Kubernetes version of the cluster | | cni | Required
Default: `cilium`
One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo` | The Container Network Interface (CNI) plugin that will run in the cluster | | ~~enable-dashboard~~ | Deprecated | The enablement of the Kubernetes Dashboard in the cluster | -| ingress | One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The Ingress Controller that will run in the cluster | +| ~~ingress~~ | Deprecated
One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The Ingress Controller that will run in the cluster | | pools.{index}.name | Required | The name of the pool | | pools.{index}.node-type | Required | The node type is the type of Scaleway Instance wanted for the pool | | pools.{index}.placement-group-id | | The placement group ID in which all the nodes of the pool will be created | @@ -320,7 +320,7 @@ scw k8s cluster update [arg=value ...] | autoscaler-config.scale-down-utilization-threshold | | Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down | | autoscaler-config.max-graceful-termination-sec | | Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node | | ~~enable-dashboard~~ | Deprecated | The new value of the Kubernetes Dashboard enablement | -| ingress | One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The new Ingress Controller for the cluster | +| ~~ingress~~ | Deprecated
One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The new Ingress Controller for the cluster | | auto-upgrade.enable | | Whether or not auto upgrade is enabled for the cluster | | auto-upgrade.maintenance-window.start-hour | | The start hour of the 2-hour maintenance window | | auto-upgrade.maintenance-window.day | One of: `any`, `monday`, `tuesday`, `wednesday`, `thursday`, `friday`, `saturday`, `sunday` | The day of the week for the maintenance window | diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go index 64de66da92..f8091a4d71 100644 --- a/internal/namespaces/k8s/v1/k8s_cli.go +++ b/internal/namespaces/k8s/v1/k8s_cli.go @@ -296,7 +296,7 @@ func k8sClusterCreate() *core.Command { Name: "ingress", Short: `The Ingress Controller that will run in the cluster`, Required: false, - Deprecated: false, + Deprecated: true, Positional: false, EnumValues: []string{"unknown_ingress", "none", "nginx", "traefik", "traefik2"}, }, @@ -743,7 +743,7 @@ func k8sClusterUpdate() *core.Command { Name: "ingress", Short: `The new Ingress Controller for the cluster`, Required: false, - Deprecated: false, + Deprecated: true, Positional: false, EnumValues: []string{"unknown_ingress", "none", "nginx", "traefik", "traefik2"}, },