Skip to content

Commit c59a424

Browse files
authored
Merge branch 'scaleway:master' into master
2 parents a98f5d6 + 704ebe3 commit c59a424

File tree

39 files changed

+17663
-5955
lines changed

39 files changed

+17663
-5955
lines changed

cmd/scw/testdata/test-all-usage-edge-services-backend-stage-create-usage.golden

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ USAGE:
66
scw edge-services backend-stage create [arg=value ...]
77

88
ARGS:
9-
[scaleway-s3.bucket-name] Name of the Bucket
10-
[scaleway-s3.bucket-region] Region of the Bucket
11-
[scaleway-s3.is-website] Defines whether the bucket website feature is enabled
12-
[scaleway-lb.lbs.{index}.id] ID of the Load Balancer
13-
[scaleway-lb.lbs.{index}.zone] Zone of the Load Balancer
14-
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
15-
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
16-
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
17-
pipeline-id Pipeline ID the Backend stage belongs to
9+
[scaleway-s3.bucket-name] Name of the Bucket
10+
[scaleway-s3.bucket-region] Region of the Bucket
11+
[scaleway-s3.is-website] Defines whether the bucket website feature is enabled
12+
[scaleway-lb.lbs.{index}.id] ID of the Load Balancer
13+
[scaleway-lb.lbs.{index}.zone] Zone of the Load Balancer
14+
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
15+
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
16+
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
17+
[scaleway-lb.lbs.{index}.has-websocket] Defines whether to forward websocket requests to the load balancer
18+
pipeline-id Pipeline ID the Backend stage belongs to
1819

1920
FLAGS:
2021
-h, --help help for create

cmd/scw/testdata/test-all-usage-edge-services-backend-stage-update-usage.golden

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ USAGE:
66
scw edge-services backend-stage update <backend-stage-id ...> [arg=value ...]
77

88
ARGS:
9-
backend-stage-id ID of the backend stage to update
10-
[scaleway-s3.bucket-name] Name of the Bucket
11-
[scaleway-s3.bucket-region] Region of the Bucket
12-
[scaleway-s3.is-website] Defines whether the bucket website feature is enabled
13-
[scaleway-lb.lbs.{index}.id] ID of the Load Balancer
14-
[scaleway-lb.lbs.{index}.zone] Zone of the Load Balancer
15-
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
16-
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
17-
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
18-
[pipeline-id] Pipeline ID the Backend stage belongs to
9+
backend-stage-id ID of the backend stage to update
10+
[scaleway-s3.bucket-name] Name of the Bucket
11+
[scaleway-s3.bucket-region] Region of the Bucket
12+
[scaleway-s3.is-website] Defines whether the bucket website feature is enabled
13+
[scaleway-lb.lbs.{index}.id] ID of the Load Balancer
14+
[scaleway-lb.lbs.{index}.zone] Zone of the Load Balancer
15+
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
16+
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
17+
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
18+
[scaleway-lb.lbs.{index}.has-websocket] Defines whether to forward websocket requests to the load balancer
19+
[pipeline-id] Pipeline ID the Backend stage belongs to
1920

2021
FLAGS:
2122
-h, --help help for update

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
@@ -29,7 +29,7 @@ ARGS:
2929
[pools.{index}.max-size] Defines the maximum size of the pool. Note that this field is only used when autoscaling is enabled on the pool
3030
[pools.{index}.container-runtime] Customization of the container runtime is available for each pool (unknown_runtime | docker | containerd | crio)
3131
[pools.{index}.autohealing] Defines whether the autohealing feature is enabled for the pool
32-
[pools.{index}.tags.{index}] Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/containers/kubernetes/api-cli/managing-tags)
32+
[pools.{index}.tags.{index}] Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/kubernetes/api-cli/managing-tags)
3333
[pools.{index}.kubelet-args.{key}] Kubelet arguments to be used by this pool. Note that this feature is 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ARGS:
2626
[max-size] Defines the maximum size of the pool. Note that this field is only used when autoscaling is enabled on the pool
2727
[container-runtime] Customization of the container runtime is available for each pool (unknown_runtime | docker | containerd | crio)
2828
[autohealing] Defines whether the autohealing feature is enabled for the pool
29-
[tags.{index}] Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/containers/kubernetes/api-cli/managing-tags)
29+
[tags.{index}] Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/kubernetes/api-cli/managing-tags)
3030
[kubelet-args.{key}] Kubelet arguments to be used by this pool. Note that this feature is experimental
3131
[upgrade-policy.max-unavailable]
3232
[upgrade-policy.max-surge]

cmd/scw/testdata/test-all-usage-k8s-version-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
33
A version is a vanilla Kubernetes version like `x.y.z`
4-
It comprises a major version `x`, a minor version `y`, and a patch version `z`. At the minimum, Kapsule (Scaleway's managed Kubernetes), will support the last patch version for the past three minor releases. Also, each version has a different set of CNIs, eventually container runtimes, feature gates, and admission plugins available. See our [Version Support Policy](https://www.scaleway.com/en/docs/containers/kubernetes/reference-content/version-support-policy/).
4+
It comprises a major version `x`, a minor version `y`, and a patch version `z`. At the minimum, Kapsule (Scaleway's managed Kubernetes), will support the last patch version for the past three minor releases. Also, each version has a different set of CNIs, eventually container runtimes, feature gates, and admission plugins available. See our [Version Support Policy](https://www.scaleway.com/en/docs/kubernetes/reference-content/version-support-policy/).
55

66
USAGE:
77
scw k8s version <command>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
version: 1
3+
interactions:
4+
- request:
5+
body: '{"message":"authentication is denied","method":"api_key","reason":"not_found","type":"denied_authentication"}'
6+
form: {}
7+
headers:
8+
User-Agent:
9+
- scaleway-sdk-go/v1.0.0-beta.35.0.20250917154444-1d3cdbf4ce0d (go1.24.6; darwin;
10+
amd64) cli-e2e-test
11+
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
12+
method: GET
13+
response:
14+
body: '{"message":"authentication is denied","method":"api_key","reason":"not_found","type":"denied_authentication"}'
15+
headers:
16+
Content-Length:
17+
- "109"
18+
Content-Security-Policy:
19+
- default-src 'none'; frame-ancestors 'none'
20+
Content-Type:
21+
- application/json
22+
Date:
23+
- Mon, 29 Sep 2025 08:31:55 GMT
24+
Server:
25+
- Scaleway API Gateway (fr-par-1;edge01)
26+
Strict-Transport-Security:
27+
- max-age=63072000
28+
X-Content-Type-Options:
29+
- nosniff
30+
X-Frame-Options:
31+
- DENY
32+
X-Request-Id:
33+
- 32b2b5f8-48c2-4aef-b89e-e8da1b64cd32
34+
status: 401 Unauthorized
35+
code: 401
36+
duration: ""

cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ USAGE:
88
ARGS:
99
acl-rule-ips IP addresses defined in the ACL rules of the Database Instance
1010
instance-id ID of the Database Instance
11-
[description] Description of the ACL rule. Indexes are not yet supported so the description will be applied to all the rules of the command.
11+
[description] Description of the ACL rule. If multiple IPs are provided, this description will be applied to all rules unless specific descriptions are provided.
12+
[descriptions] Descriptions of the ACL rules
1213
[region=fr-par] Region to target. If none is passed will use default region from the config
1314

1415
FLAGS:

docs/commands/edge-services.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ scw edge-services backend-stage create [arg=value ...]
8282
| scaleway-lb.lbs.{index}.frontend-id | | ID of the frontend linked to the Load Balancer |
8383
| scaleway-lb.lbs.{index}.is-ssl | | Defines whether the Load Balancer's frontend handles SSL connections |
8484
| scaleway-lb.lbs.{index}.domain-name | | Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer |
85+
| scaleway-lb.lbs.{index}.has-websocket | | Defines whether to forward websocket requests to the load balancer |
8586
| pipeline-id | Required | Pipeline ID the Backend stage belongs to |
8687

8788

@@ -171,6 +172,7 @@ scw edge-services backend-stage update <backend-stage-id ...> [arg=value ...]
171172
| scaleway-lb.lbs.{index}.frontend-id | | ID of the frontend linked to the Load Balancer |
172173
| scaleway-lb.lbs.{index}.is-ssl | | Defines whether the Load Balancer's frontend handles SSL connections |
173174
| scaleway-lb.lbs.{index}.domain-name | | Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer |
175+
| scaleway-lb.lbs.{index}.has-websocket | | Defines whether to forward websocket requests to the load balancer |
174176
| pipeline-id | | Pipeline ID the Backend stage belongs to |
175177

176178

docs/commands/k8s.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ scw k8s cluster create [arg=value ...]
175175
| pools.{index}.max-size | | Defines the maximum size of the pool. Note that this field is only used when autoscaling is enabled on the pool |
176176
| pools.{index}.container-runtime | One of: `unknown_runtime`, `docker`, `containerd`, `crio` | Customization of the container runtime is available for each pool |
177177
| pools.{index}.autohealing | | Defines whether the autohealing feature is enabled for the pool |
178-
| pools.{index}.tags.{index} | | Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/containers/kubernetes/api-cli/managing-tags) |
178+
| pools.{index}.tags.{index} | | Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/kubernetes/api-cli/managing-tags) |
179179
| pools.{index}.kubelet-args.{key} | | Kubelet arguments to be used by this pool. Note that this feature is experimental |
180180
| pools.{index}.upgrade-policy.max-unavailable | | The maximum number of nodes that can be not ready at the same time |
181181
| pools.{index}.upgrade-policy.max-surge | | The maximum number of nodes to be created during the upgrade |
@@ -1006,7 +1006,7 @@ scw k8s pool create [arg=value ...]
10061006
| max-size | | Defines the maximum size of the pool. Note that this field is only used when autoscaling is enabled on the pool |
10071007
| container-runtime | One of: `unknown_runtime`, `docker`, `containerd`, `crio` | Customization of the container runtime is available for each pool |
10081008
| autohealing | | Defines whether the autohealing feature is enabled for the pool |
1009-
| tags.{index} | | Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/containers/kubernetes/api-cli/managing-tags) |
1009+
| tags.{index} | | Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/kubernetes/api-cli/managing-tags) |
10101010
| kubelet-args.{key} | | Kubelet arguments to be used by this pool. Note that this feature is experimental |
10111011
| upgrade-policy.max-unavailable | | |
10121012
| upgrade-policy.max-surge | | |
@@ -1303,7 +1303,7 @@ scw k8s pool wait 11111111-1111-1111-1111-111111111111
13031303
## Available Kubernetes versions commands
13041304

13051305
A version is a vanilla Kubernetes version like `x.y.z`
1306-
It comprises a major version `x`, a minor version `y`, and a patch version `z`. At the minimum, Kapsule (Scaleway's managed Kubernetes), will support the last patch version for the past three minor releases. Also, each version has a different set of CNIs, eventually container runtimes, feature gates, and admission plugins available. See our [Version Support Policy](https://www.scaleway.com/en/docs/containers/kubernetes/reference-content/version-support-policy/).
1306+
It comprises a major version `x`, a minor version `y`, and a patch version `z`. At the minimum, Kapsule (Scaleway's managed Kubernetes), will support the last patch version for the past three minor releases. Also, each version has a different set of CNIs, eventually container runtimes, feature gates, and admission plugins available. See our [Version Support Policy](https://www.scaleway.com/en/docs/kubernetes/reference-content/version-support-policy/).
13071307

13081308

13091309
### Get a Version

docs/commands/rdb.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ scw rdb acl add <acl-rule-ips ...> [arg=value ...]
103103

104104
| Name | | Description |
105105
|------|---|-------------|
106-
| acl-rule-ips | Required | IP addresses defined in the ACL rules of the Database Instance |
106+
| acl-rule-ips | | IP addresses defined in the ACL rules of the Database Instance |
107107
| instance-id | Required | ID of the Database Instance |
108-
| description | | Description of the ACL rule. Indexes are not yet supported so the description will be applied to all the rules of the command. |
108+
| description | | Description of the ACL rule. If multiple IPs are provided, this description will be applied to all rules unless specific descriptions are provided. |
109+
| descriptions | | Descriptions of the ACL rules |
109110
| region | Default: `fr-par` | Region to target. If none is passed will use default region from the config |
110111

111112

@@ -125,7 +126,7 @@ scw rdb acl delete <acl-rule-ips ...> [arg=value ...]
125126

126127
| Name | | Description |
127128
|------|---|-------------|
128-
| acl-rule-ips | Required | IP addresses defined in the ACL rules of the Database Instance |
129+
| acl-rule-ips | | IP addresses defined in the ACL rules of the Database Instance |
129130
| instance-id | Required | ID of the Database Instance |
130131
| region | Default: `fr-par` | Region to target. If none is passed will use default region from the config |
131132

0 commit comments

Comments
 (0)