Skip to content

Commit 77a13a3

Browse files
feat(k8s): deprecate usage of ingress (#2219)
Co-authored-by: Rémy Léone <[email protected]>
1 parent ed67a9f commit 77a13a3

File tree

4 files changed

+6
-6
lines changed

4 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
@@ -20,7 +20,6 @@ ARGS:
2020
[tags.{index}] The tags associated with the cluster
2121
version=latest The Kubernetes version of the cluster
2222
cni=cilium The Container Network Interface (CNI) plugin that will run in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo)
23-
[ingress] The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2)
2423
pools.{index}.name The name of the pool
2524
pools.{index}.node-type The node type is the type of Scaleway Instance wanted for the pool
2625
[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:
6362

6463
DEPRECATED ARGS:
6564
[enable-dashboard] The enablement of the Kubernetes Dashboard in the cluster
65+
[ingress] The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2)
6666

6767
FLAGS:
6868
-h, --help help for create

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ ARGS:
2727
[autoscaler-config.scale-down-unneeded-time] How long a node should be unneeded before it is eligible for scale down
2828
[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
2929
[autoscaler-config.max-graceful-termination-sec] Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
30-
[ingress] The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2)
3130
[auto-upgrade.enable] Whether or not auto upgrade is enabled for the cluster
3231
[auto-upgrade.maintenance-window.start-hour] The start hour of the 2-hour maintenance window
3332
[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:
4544

4645
DEPRECATED ARGS:
4746
[enable-dashboard] The new value of the Kubernetes Dashboard enablement
47+
[ingress] The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2)
4848

4949
FLAGS:
5050
-h, --help help for update

docs/commands/k8s.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ scw k8s cluster create [arg=value ...]
6666
| version | Required<br />Default: `latest` | The Kubernetes version of the cluster |
6767
| cni | Required<br />Default: `cilium`<br />One of: `unknown_cni`, `cilium`, `calico`, `weave`, `flannel`, `kilo` | The Container Network Interface (CNI) plugin that will run in the cluster |
6868
| ~~enable-dashboard~~ | Deprecated | The enablement of the Kubernetes Dashboard in the cluster |
69-
| ingress | One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The Ingress Controller that will run in the cluster |
69+
| ~~ingress~~ | Deprecated<br />One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The Ingress Controller that will run in the cluster |
7070
| pools.{index}.name | Required | The name of the pool |
7171
| pools.{index}.node-type | Required | The node type is the type of Scaleway Instance wanted for the pool |
7272
| 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 <cluster-id ...> [arg=value ...]
320320
| 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 |
321321
| autoscaler-config.max-graceful-termination-sec | | Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node |
322322
| ~~enable-dashboard~~ | Deprecated | The new value of the Kubernetes Dashboard enablement |
323-
| ingress | One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The new Ingress Controller for the cluster |
323+
| ~~ingress~~ | Deprecated<br />One of: `unknown_ingress`, `none`, `nginx`, `traefik`, `traefik2` | The new Ingress Controller for the cluster |
324324
| auto-upgrade.enable | | Whether or not auto upgrade is enabled for the cluster |
325325
| auto-upgrade.maintenance-window.start-hour | | The start hour of the 2-hour maintenance window |
326326
| auto-upgrade.maintenance-window.day | One of: `any`, `monday`, `tuesday`, `wednesday`, `thursday`, `friday`, `saturday`, `sunday` | The day of the week for the maintenance window |

internal/namespaces/k8s/v1/k8s_cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func k8sClusterCreate() *core.Command {
296296
Name: "ingress",
297297
Short: `The Ingress Controller that will run in the cluster`,
298298
Required: false,
299-
Deprecated: false,
299+
Deprecated: true,
300300
Positional: false,
301301
EnumValues: []string{"unknown_ingress", "none", "nginx", "traefik", "traefik2"},
302302
},
@@ -743,7 +743,7 @@ func k8sClusterUpdate() *core.Command {
743743
Name: "ingress",
744744
Short: `The new Ingress Controller for the cluster`,
745745
Required: false,
746-
Deprecated: false,
746+
Deprecated: true,
747747
Positional: false,
748748
EnumValues: []string{"unknown_ingress", "none", "nginx", "traefik", "traefik2"},
749749
},

0 commit comments

Comments
 (0)