Skip to content

Commit e687ec8

Browse files
docs(k8s): review wording k8s docs (#2864)
Co-authored-by: Rémy Léone <rleone@scaleway.com>
1 parent 64be9ca commit e687ec8

27 files changed

+422
-446
lines changed

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to create a new Kubernetes cluster on an account.
3+
Creates a new Kubernetes cluster on a Scaleway account.
44

55
USAGE:
66
scw k8s cluster create [arg=value ...]
@@ -14,28 +14,28 @@ EXAMPLES:
1414

1515
ARGS:
1616
[project-id] Project ID to use. If none is passed the default project ID will be used
17-
[type] The type of the cluster
18-
name=<generated> The name of the cluster
19-
[description] The description of the cluster
20-
[tags.{index}] The tags associated with the cluster
21-
version=latest The Kubernetes version of the cluster
22-
cni=cilium The Container Network Interface (CNI) plugin that will run in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo)
23-
pools.{index}.name The name of the pool
24-
pools.{index}.node-type The node type is the type of Scaleway Instance wanted for the pool
25-
[pools.{index}.placement-group-id] The placement group ID in which all the nodes of the pool will be created
26-
[pools.{index}.autoscaling] The enablement of the autoscaling feature for the pool
27-
pools.{index}.size The size (number of nodes) of the pool
28-
[pools.{index}.min-size] The minimum size of the pool
29-
[pools.{index}.max-size] The maximum size of the pool
30-
[pools.{index}.container-runtime] The container runtime for the nodes of the pool (unknown_runtime | docker | containerd | crio)
31-
[pools.{index}.autohealing] The enablement of the autohealing feature for the pool
32-
[pools.{index}.tags.{index}] The tags associated with the pool
33-
[pools.{index}.kubelet-args.{key}] The Kubelet arguments to be used by this pool. Note that this feature is to be considered as experimental
17+
[type] Type of the cluster
18+
name=<generated> Name of the cluster
19+
[description] Description of the cluster
20+
[tags.{index}] Tags associated with the cluster
21+
version=latest Kubernetes version of the cluster
22+
cni=cilium Container Network Interface (CNI) plugin that will run in the cluster (unknown_cni | cilium | calico | weave | flannel | kilo)
23+
pools.{index}.name Name of the pool
24+
pools.{index}.node-type Node type is the type of Scaleway Instance wanted for the pool
25+
[pools.{index}.placement-group-id] Placement group ID in which all the nodes of the pool will be created
26+
[pools.{index}.autoscaling] Defines whether the autoscaling feature is enabled for the pool
27+
pools.{index}.size Size (number of nodes) of the pool
28+
[pools.{index}.min-size] Minimum size of the pool
29+
[pools.{index}.max-size] Maximum size of the pool
30+
[pools.{index}.container-runtime] Container runtime for the nodes of the pool (unknown_runtime | docker | containerd | crio)
31+
[pools.{index}.autohealing] Defines whether the autohealing feature is enabled for the pool
32+
[pools.{index}.tags.{index}] Tags associated with the pool
33+
[pools.{index}.kubelet-args.{key}] Kubelet arguments to be used by this pool. Note that this feature is to be considered as experimental
3434
[pools.{index}.upgrade-policy.max-unavailable] The maximum number of nodes that can be not ready at the same time
3535
[pools.{index}.upgrade-policy.max-surge] The maximum number of nodes to be created during the upgrade
36-
[pools.{index}.zone] The Zone in which the Pool's node will be spawn in
37-
[pools.{index}.root-volume-type] The system volume disk type (default_volume_type | l_ssd | b_ssd)
38-
[pools.{index}.root-volume-size] The system volume disk size
36+
[pools.{index}.zone] Zone in which the pool's nodes will be spawned
37+
[pools.{index}.root-volume-type] System volume disk type (default_volume_type | l_ssd | b_ssd)
38+
[pools.{index}.root-volume-size] System volume disk size
3939
[autoscaler-config.scale-down-disabled] Disable the cluster autoscaler
4040
[autoscaler-config.scale-down-delay-after-add] How long after scale up that scale down evaluation resumes
4141
[autoscaler-config.estimator] Type of resource estimator to be used in scale up (unknown_estimator | binpacking)
@@ -47,8 +47,8 @@ ARGS:
4747
[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
4848
[autoscaler-config.max-graceful-termination-sec] Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
4949
[auto-upgrade.enable] Whether or not auto upgrade is enabled for the cluster
50-
[auto-upgrade.maintenance-window.start-hour] The start hour of the 2-hour maintenance window
51-
[auto-upgrade.maintenance-window.day] The day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday)
50+
[auto-upgrade.maintenance-window.start-hour] Start time of the two-hour maintenance window
51+
[auto-upgrade.maintenance-window.day] Day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday)
5252
[feature-gates.{index}] List of feature gates to enable
5353
[admission-plugins.{index}] List of admission plugins to enable
5454
[open-id-connect-config.issuer-url] URL of the provider which allows the API server to discover public signing keys
@@ -57,14 +57,14 @@ ARGS:
5757
[open-id-connect-config.username-prefix] Prefix prepended to username
5858
[open-id-connect-config.groups-claim.{index}] JWT claim to use as the user's group
5959
[open-id-connect-config.groups-prefix] Prefix prepended to group claims
60-
[open-id-connect-config.required-claim.{index}] Multiple key=value pairs that describes a required claim in the ID Token
60+
[open-id-connect-config.required-claim.{index}] Multiple key=value pairs that describes a required claim in the ID token
6161
[apiserver-cert-sans.{index}] Additional Subject Alternative Names for the Kubernetes API server certificate
6262
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
6363
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
6464

6565
DEPRECATED ARGS:
66-
[enable-dashboard] The enablement of the Kubernetes Dashboard in the cluster
67-
[ingress] The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2)
66+
[enable-dashboard] Defines if the Kubernetes Dashboard is enabled in the cluster
67+
[ingress] Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2)
6868

6969
FLAGS:
7070
-h, --help help for create

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to delete a specific cluster and all its associated pools and nodes. Note that this method will not delete any Load Balancers or Block Volumes that are associated with the cluster.
3+
Deletes a specific cluster and all its associated pools and nodes. Note that this method will not delete any Load Balancers or Block Volumes that are associated with the cluster.
44

55
USAGE:
66
scw k8s cluster delete <cluster-id ...> [arg=value ...]
77

88
EXAMPLES:
9-
Delete a given cluster
9+
Delete a cluster
1010
scw k8s cluster delete 11111111-1111-1111-111111111111
1111

1212
ARGS:
13-
cluster-id The ID of the cluster to delete
13+
cluster-id ID of the cluster to delete
1414
[with-additional-resources] Set true if you want to delete all volumes (including retain volume type) and loadbalancers whose name start with cluster ID
1515
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
1616

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to get details about a specific Kubernetes cluster.
3+
Get details about a specific Kubernetes cluster.
44

55
USAGE:
66
scw k8s cluster get <cluster-id ...> [arg=value ...]
77

88
EXAMPLES:
9-
Get a given cluster
9+
Get a cluster information
1010
scw k8s cluster get 11111111-1111-1111-111111111111
1111

1212
ARGS:

cmd/scw/testdata/test-all-usage-k8s-cluster-list-available-versions-usage.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to list the versions that a specific Kubernetes cluster is allowed to upgrade to. Note that it will be every patch version greater than the actual one as well a one minor version ahead of the actual one. Upgrades skipping a minor version will not work.
3+
List the versions that a specific Kubernetes cluster is allowed to upgrade to. Results will comprise every patch version greater than the current patch, as well as one minor version ahead of the current version. Any upgrade skipping a minor version will not work.
44

55
USAGE:
66
scw k8s cluster list-available-versions <cluster-id ...> [arg=value ...]
77

88
EXAMPLES:
9-
List all available versions for a given cluster to upgrade to
9+
List all available versions for a cluster to upgrade to
1010
scw k8s cluster list-available-versions 11111111-1111-1111-111111111111
1111

1212
ARGS:
13-
cluster-id The ID of the cluster which the available Kuberentes versions will be listed from
13+
cluster-id ID of the cluster which the available Kuberentes versions will be listed from
1414
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
1515

1616
FLAGS:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to list all the existing Kubernetes clusters in an account.
3+
List all the existing Kubernetes clusters in a specific Region.
44

55
USAGE:
66
scw k8s cluster list [arg=value ...]
77

88
EXAMPLES:
9-
List all the clusters on your default region
9+
List all clusters on your default region
1010
scw k8s cluster list
1111

1212
List the ready clusters on your default region
@@ -16,12 +16,12 @@ EXAMPLES:
1616
scw k8s cluster list region=fr-par name=cluster1
1717

1818
ARGS:
19-
[project-id] The project ID on which to filter the returned clusters
20-
[order-by] The sort order of the returned clusters (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc | name_asc | name_desc | status_asc | status_desc | version_asc | version_desc)
21-
[name] The name on which to filter the returned clusters
22-
[status] The status on which to filter the returned clusters (unknown | creating | ready | deleting | deleted | updating | locked | pool_required)
23-
[type] The type on which to filter the returned clusters
24-
[organization-id] The organization ID on which to filter the returned clusters
19+
[project-id] Project ID on which to filter the returned clusters
20+
[order-by] Sort order of the returned clusters (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc | name_asc | name_desc | status_asc | status_desc | version_asc | version_desc)
21+
[name] Name on which to filter the returned clusters
22+
[status] Status on which to filter the returned clusters (unknown | creating | ready | deleting | deleted | updating | locked | pool_required)
23+
[type] Type on which to filter the returned clusters
24+
[organization-id] Organization ID on which to filter the returned clusters
2525
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
2626

2727
FLAGS:

cmd/scw/testdata/test-all-usage-k8s-cluster-reset-admin-token-usage.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to reset the admin token for a specific Kubernetes cluster. This will invalidate the old admin token (which will not be usable after) and create a new one. Note that the redownload of the kubeconfig will be necessary to keep interacting with the cluster (if the old admin token was used).
3+
Reset the admin token for a specific Kubernetes cluster. This will invalidate the old admin token (which will not be usable afterwards) and create a new one. Note that you will need to redownload kubeconfig in order to keep interacting with the cluster.
44

55
USAGE:
66
scw k8s cluster reset-admin-token <cluster-id ...> [arg=value ...]
77

88
EXAMPLES:
9-
Reset the admin token for a given cluster
9+
Reset the admin token for a cluster
1010
scw k8s cluster reset-admin-token 11111111-1111-1111-111111111111
1111

1212
ARGS:
13-
cluster-id The ID of the cluster of which the admin token will be renewed
13+
cluster-id ID of the cluster on which the admin token will be renewed
1414
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
1515

1616
FLAGS:

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
This method allows to update a specific Kubernetes cluster. Note that this method is not made to upgrade a Kubernetes cluster.
3+
Update a specific Kubernetes cluster. Note that this method is designed to update details such as name, description, tags and configuration. However, you cannot upgrade a cluster with this method. To do so, use the dedicated endpoint.
44

55
USAGE:
66
scw k8s cluster update <cluster-id ...> [arg=value ...]
77

88
EXAMPLES:
9-
Enable dashboard on a given cluster
9+
Enable dashboard on a cluster
1010
scw k8s cluster update 11111111-1111-1111-111111111111 enable-dashboard=true
1111

12-
Add TTLAfterFinished and ServiceNodeExclusion as feature gates on a given cluster
12+
Add TTLAfterFinished and ServiceNodeExclusion as feature gates on a cluster
1313
scw k8s cluster update 11111111-1111-1111-111111111111 feature-gates.0=TTLAfterFinished feature-gates.1=ServiceNodeExclusion
1414

1515
ARGS:
16-
cluster-id The ID of the cluster to update
17-
[name] The new name of the cluster
18-
[description] The new description of the cluster
19-
[tags.{index}] The new tags associated with the cluster
16+
cluster-id ID of the cluster to update
17+
[name] New external name of the cluster
18+
[description] New description of the cluster
19+
[tags.{index}] New tags associated with the cluster
2020
[autoscaler-config.scale-down-disabled] Disable the cluster autoscaler
2121
[autoscaler-config.scale-down-delay-after-add] How long after scale up that scale down evaluation resumes
2222
[autoscaler-config.estimator] Type of resource estimator to be used in scale up (unknown_estimator | binpacking)
@@ -28,8 +28,8 @@ ARGS:
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
3030
[auto-upgrade.enable] Whether or not auto upgrade is enabled for the cluster
31-
[auto-upgrade.maintenance-window.start-hour] The start hour of the 2-hour maintenance window
32-
[auto-upgrade.maintenance-window.day] The day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday)
31+
[auto-upgrade.maintenance-window.start-hour] Start time of the two-hour maintenance window
32+
[auto-upgrade.maintenance-window.day] Day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday)
3333
[feature-gates.{index}] List of feature gates to enable
3434
[admission-plugins.{index}] List of admission plugins to enable
3535
[open-id-connect-config.issuer-url] URL of the provider which allows the API server to discover public signing keys
@@ -38,13 +38,13 @@ ARGS:
3838
[open-id-connect-config.username-prefix] Prefix prepended to username
3939
[open-id-connect-config.groups-claim.{index}] JWT claim to use as the user's group
4040
[open-id-connect-config.groups-prefix] Prefix prepended to group claims
41-
[open-id-connect-config.required-claim.{index}] Multiple key=value pairs that describes a required claim in the ID Token
41+
[open-id-connect-config.required-claim.{index}] Multiple key=value pairs that describes a required claim in the ID token
4242
[apiserver-cert-sans.{index}] Additional Subject Alternative Names for the Kubernetes API server certificate
4343
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
4444

4545
DEPRECATED ARGS:
46-
[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)
46+
[enable-dashboard] New value of the Kubernetes Dashboard enablement
47+
[ingress] New Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2)
4848

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

0 commit comments

Comments
 (0)