Skip to content

Commit 6e982f2

Browse files
feat(lb): display ipam_id for pn attachment in doc (scaleway#3924)
Co-authored-by: Rémy Léone <[email protected]>
1 parent bf761bf commit 6e982f2

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ USAGE:
88
ARGS:
99
lb-id Load Balancer ID
1010
private-network-id Private Network ID
11+
[ipam-ids.{index}] IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network. In the future, it will be possible to specify multiple IPs in this field (IPv4 and IPv6), for now only one ID of an IPv4 address is expected. When null, a new private IP address is created for the Load Balancer on this Private Network.
1112
[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 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1213

13-
DEPRECATED ARGS:
14-
[static-config.ip-address.{index}] Array of a local IP address for the Load Balancer on this Private Network
15-
[dhcp-config.ip-id]
16-
1714
FLAGS:
1815
-h, --help help for attach
1916

docs/commands/lb.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,8 +1130,7 @@ scw lb private-network attach <lb-id ...> [arg=value ...]
11301130
|------|---|-------------|
11311131
| lb-id | Required | Load Balancer ID |
11321132
| private-network-id | Required | Private Network ID |
1133-
| ~~static-config.ip-address.{index}~~ | Deprecated | Array of a local IP address for the Load Balancer on this Private Network |
1134-
| ~~dhcp-config.ip-id~~ | Deprecated | |
1133+
| ipam-ids.{index} | | IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network. In the future, it will be possible to specify multiple IPs in this field (IPv4 and IPv6), for now only one ID of an IPv4 address is expected. When null, a new private IP address is created for the Load Balancer on this Private Network. |
11351134
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
11361135

11371136

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/mattn/go-isatty v0.0.20
2828
github.com/moby/buildkit v0.13.2
2929
github.com/opencontainers/go-digest v1.0.0
30-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240626093447-0e434aaceca3
30+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627133541-29fff7fd188d
3131
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
3232
github.com/spf13/cobra v1.8.1
3333
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
463463
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
464464
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
465465
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
466-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240626093447-0e434aaceca3 h1:K57vK1bLYRcq5wfJfbOdysC2J0F2bpfwLCCDiIxb0Cg=
467-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240626093447-0e434aaceca3/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
466+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627133541-29fff7fd188d h1:CsaMtjIO39PaZINAznYmKFVh2KQU/FOvUaAuFJucXK8=
467+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627133541-29fff7fd188d/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
468468
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
469469
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
470470
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/lb/v1/lb_cli.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3299,16 +3299,10 @@ func lbPrivateNetworkAttach() *core.Command {
32993299
Positional: false,
33003300
},
33013301
{
3302-
Name: "static-config.ip-address.{index}",
3303-
Short: `Array of a local IP address for the Load Balancer on this Private Network`,
3302+
Name: "ipam-ids.{index}",
3303+
Short: `IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network. In the future, it will be possible to specify multiple IPs in this field (IPv4 and IPv6), for now only one ID of an IPv4 address is expected. When null, a new private IP address is created for the Load Balancer on this Private Network.`,
33043304
Required: false,
3305-
Deprecated: true,
3306-
Positional: false,
3307-
},
3308-
{
3309-
Name: "dhcp-config.ip-id",
3310-
Required: false,
3311-
Deprecated: true,
3305+
Deprecated: false,
33123306
Positional: false,
33133307
},
33143308
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),

0 commit comments

Comments
 (0)