Skip to content

Commit ee374cf

Browse files
authored
Merge branch 'master' into v1.6559.0
2 parents 0586590 + 67d6985 commit ee374cf

File tree

45 files changed

+6501
-5049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+6501
-5049
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ COPY .git/ .git/
2323

2424
RUN ./scripts/build.sh
2525

26-
FROM alpine:3.21
26+
FROM alpine:3.22
2727
WORKDIR /
2828
RUN apk update && apk add --no-cache bash ca-certificates openssh-client && update-ca-certificates
2929
COPY --from=builder /go/src/github.com/scaleway/scaleway-cli/scw .

cmd/scw/testdata/test-all-usage-baremetal-private-network-add-usage.golden

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Add a server to a Private Network.
3+
Add an Elastic Metal server to a Private Network.
44

55
USAGE:
66
scw baremetal private-network add [arg=value ...]
77

88
ARGS:
9-
server-id The ID of the server
10-
private-network-id The ID of the Private Network
11-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-2)
9+
server-id UUID of the server
10+
private-network-id UUID of the Private Network
11+
[ipam-ip-ids.{index}] IPAM IDs of an IPs to attach to the server
12+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
1213

1314
FLAGS:
1415
-h, --help help for add

cmd/scw/testdata/test-all-usage-baremetal-private-network-delete-usage.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ USAGE:
66
scw baremetal private-network delete [arg=value ...]
77

88
ARGS:
9-
server-id The ID of the server
10-
private-network-id The ID of the Private Network
11-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-2)
9+
server-id UUID of the server
10+
private-network-id UUID of the Private Network
11+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
1212

1313
FLAGS:
1414
-h, --help help for delete

cmd/scw/testdata/test-all-usage-baremetal-private-network-list-usage.golden

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
List the Private Networks of a server.
3+
List the Private Networks of an Elastic Metal server.
44

55
USAGE:
66
scw baremetal private-network list [arg=value ...]
77

88
ARGS:
9-
[order-by] The sort order for the returned Private Networks (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc)
10-
[server-id] Filter Private Networks by server ID
11-
[private-network-id] Filter Private Networks by Private Network ID
12-
[project-id] Filter Private Networks by Project ID
13-
[organization-id] Filter Private Networks by Organization ID
14-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-2 | all)
9+
[order-by] Sort order for the returned Private Networks (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc)
10+
[server-id] Filter Private Networks by server UUID
11+
[private-network-id] Filter Private Networks by Private Network UUID
12+
[project-id] Filter Private Networks by project UUID
13+
[ipam-ip-ids.{index}] Filter Private Networks by IPAM IP UUIDs
14+
[organization-id] Filter Private Networks by organization UUID
15+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3 | all)
1516

1617
FLAGS:
1718
-h, --help help for list

cmd/scw/testdata/test-all-usage-baremetal-private-network-set-usage.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Set multiple Private Networks on a server.
3+
Configure multiple Private Networks on an Elastic Metal server.
44

55
USAGE:
66
scw baremetal private-network set [arg=value ...]
77

88
ARGS:
9-
server-id The ID of the server
10-
private-network-ids.{index} The IDs of the Private Networks
11-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-2)
9+
server-id UUID of the server
10+
per-private-network-ipam-ip-ids.{key} Object where the keys are the UUIDs of Private Networks and the values are arrays of IPAM IDs representing the IPs to assign to this Elastic Metal server on the Private Network. If the array supplied for a Private Network is empty, the next available IP from the Private Network's CIDR block will automatically be used for attachment.
11+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
1212

1313
FLAGS:
1414
-h, --help help for set

cmd/scw/testdata/test-all-usage-baremetal-private-network-usage.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
33
A Private Network allows you to interconnect your resources
4-
(servers, instances, ...) in an isolated and private
5-
network. The network reachability is limited to the
6-
resources that are on the same Private Network . A VLAN
4+
in an isolated and private
5+
network. Network reachability is limited to the
6+
resources that are on the same Private Network. A VLAN
77
interface is available on the server and can be freely
8-
managed (adding IP addresses, shutdown interface...).
8+
managed (adding IP addresses, shutdown interface etc.).
99

1010
Note that a resource can be a part of multiple Private Networks.
1111

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Elastic Metal API.
4+
5+
USAGE:
6+
scw baremetal <command>
7+
8+
AVAILABLE COMMANDS:
9+
bmc Baseboard Management Controller (BMC) management commands
10+
offer Server offer management commands
11+
options Server options management commands
12+
os Operating System (OS) management commands
13+
partitioning-schemas Partitioning-schemas management commands
14+
private-network Private network management command
15+
server Server management commands
16+
settings Settings management commands
17+
18+
FLAGS:
19+
-h, --help help for baremetal
20+
21+
GLOBAL FLAGS:
22+
-c, --config string The path to the config file
23+
-D, --debug Enable debug mode
24+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
25+
-p, --profile string The config profile to use
26+
27+
Use "scw baremetal [command] --help" for more information about a command.

cmd/scw/testdata/test-all-usage-baremetal-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AVAILABLE COMMANDS:
1111
options Server options management commands
1212
os Operating System (OS) management commands
1313
partitioning-schemas Partitioning-schemas management commands
14-
private-network Private Network management command
14+
private-network Private network management command
1515
server Server management commands
1616
settings Settings management commands
1717

cmd/scw/testdata/test-all-usage-inference-deployment-create-usage.golden

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ USAGE:
88
ARGS:
99
name=<generated> Name of the deployment
1010
[project-id] Project ID to use. If none is passed the default project ID will be used
11-
model-name Name of the model to use
11+
model-id ID of the model to use
1212
[accept-eula] Accept the model's End User License Agreement (EULA).
13-
node-type Name of the node type to use
13+
node-type-name Name of the node type to use
1414
[tags.{index}] List of tags to apply to the deployment
1515
[min-size] Defines the minimum size of the pool
1616
[max-size] Defines the maximum size of the pool
17-
[endpoints.{index}.is-public=false] Will configure your public endpoint if true
18-
[endpoints.{index}.private-network.private-network-id] ID of the Private Network
17+
[endpoints.{index}.private-network.private-network-id]
1918
[endpoints.{index}.disable-auth=false] Disable the authentication on the endpoint.
19+
[quantization.bits] The number of bits each model parameter should be quantized to. The quantization method is chosen based on this value.
2020
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
2121

2222
FLAGS:
2323
-h, --help help for create
24-
-w, --wait wait until the deployment is ready
2524

2625
GLOBAL FLAGS:
2726
-c, --config string The path to the config file

cmd/scw/testdata/test-all-usage-inference-deployment-delete-usage.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ARGS:
1111

1212
FLAGS:
1313
-h, --help help for delete
14-
-w, --wait wait until the deployment is ready
1514

1615
GLOBAL FLAGS:
1716
-c, --config string The path to the config file

0 commit comments

Comments
 (0)