Skip to content

feat(instance): deprecate use of nat for IP #4105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 9, 2024
+14 −14
Merged

feat(instance): deprecate use of nat for IP #4105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a874d1
feat: update generated APIs
scaleway-bot Sep 6, 2024
09eb240
Fix
remyleone Sep 9, 2024
51f3e96
Fix
remyleone Sep 9, 2024
490e7cf
Fix
remyleone Sep 9, 2024
60ebb76
FIx
remyleone Sep 9, 2024
beeb01a
Merge branch 'master' into manual_1725640235
remyleone Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-instance-ip-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ARGS:
[project-id] Project ID to use. If none is passed the default project ID will be used
[tags.{index}] Tags of the IP
[server] UUID of the Instance you want to attach the IP to
[type] IP type to reserve (either 'nat', 'routed_ipv4' or 'routed_ipv6') (unknown_iptype | nat | routed_ipv4 | routed_ipv6)
[type] IP type to reserve (either 'routed_ipv4' or 'routed_ipv6', use of 'nat' is deprecated) (unknown_iptype | nat | routed_ipv4 | routed_ipv6)
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)

Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-instance-ip-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ARGS:
[project-id] Project ID in which the IPs are reserved
[tags] Filter IPs with these exact tags (to filter with several tags, use commas to separate them)
[name] Filter on the IP address (Works as a LIKE operation on the IP address)
[type] Filter on the IP Mobility IP type (whose value should be either 'nat', 'routed_ipv4' or 'routed_ipv6')
[type] Filter on the IP Mobility IP type (whose value should be either 'routed_ipv4', 'routed_ipv6' or 'nat')
[organization-id] Organization ID in which the IPs are reserved
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3 | all)

Expand Down
6 changes: 3 additions & 3 deletions cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ARGS:
[volumes.{key}.project] Project ID of the volume
[volumes.{key}.organization] Organization ID of the volume
[dynamic-ip-required]
[routed-ip-enabled] True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False)
[public-ips.{index}] A list of reserved IP IDs to attach to the Instance
[protected]
[security-group-id]
Expand All @@ -45,8 +44,9 @@ ARGS:
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)

DEPRECATED ARGS:
[bootscript]
[enable-ipv6]
[bootscript]
[routed-ip-enabled] True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False)
[enable-ipv6]

FLAGS:
-h, --help help for update
Expand Down
6 changes: 3 additions & 3 deletions docs/commands/instance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ scw instance ip create [arg=value ...]
| project-id | | Project ID to use. If none is passed the default project ID will be used |
| tags.{index} | | Tags of the IP |
| server | | UUID of the Instance you want to attach the IP to |
| type | One of: `unknown_iptype`, `nat`, `routed_ipv4`, `routed_ipv6` | IP type to reserve (either 'nat', 'routed_ipv4' or 'routed_ipv6') |
| type | One of: `unknown_iptype`, `nat`, `routed_ipv4`, `routed_ipv6` | IP type to reserve (either 'routed_ipv4' or 'routed_ipv6', use of 'nat' is deprecated) |
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `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 |

Expand Down Expand Up @@ -533,7 +533,7 @@ scw instance ip list [arg=value ...]
| project-id | | Project ID in which the IPs are reserved |
| tags | | Filter IPs with these exact tags (to filter with several tags, use commas to separate them) |
| name | | Filter on the IP address (Works as a LIKE operation on the IP address) |
| type | | Filter on the IP Mobility IP type (whose value should be either 'nat', 'routed_ipv4' or 'routed_ipv6') |
| type | | Filter on the IP Mobility IP type (whose value should be either 'routed_ipv4', 'routed_ipv6' or 'nat') |
| organization-id | | Organization ID in which the IPs are reserved |
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |

Expand Down Expand Up @@ -2264,7 +2264,7 @@ scw instance server update <server-id ...> [arg=value ...]
| volumes.{key}.organization | | Organization ID of the volume |
| ~~bootscript~~ | Deprecated | |
| dynamic-ip-required | | |
| routed-ip-enabled | | True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False) |
| ~~routed-ip-enabled~~ | Deprecated | True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False) |
| public-ips.{index} | | A list of reserved IP IDs to attach to the Instance |
| ~~enable-ipv6~~ | Deprecated | |
| protected | | |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/mattn/go-isatty v0.0.20
github.com/moby/buildkit v0.13.2
github.com/opencontainers/go-digest v1.0.0
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240823125746-1aae88e92d14
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240823125746-1aae88e92d14 h1:BxQQCTnvdpnhUJl1ICWeCKzV2Esbi3dGruIIk9xrDTk=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240823125746-1aae88e92d14/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 h1:yoKAVkEVwAqbGbR8n87rHQ1dulL25rKloGadb3vm770=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30/go.mod h1:sH0u6fq6x4R5M7WxkoQFY/o7UaiItec0o1LinLCJNq8=
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
Expand Down
6 changes: 3 additions & 3 deletions internal/namespaces/instance/v1/instance_cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ func instanceServerUpdate() *core.Command {
Name: "routed-ip-enabled",
Short: `True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False)`,
Required: false,
Deprecated: false,
Deprecated: true,
Positional: false,
},
{
Expand Down Expand Up @@ -3326,7 +3326,7 @@ func instanceIPList() *core.Command {
},
{
Name: "type",
Short: `Filter on the IP Mobility IP type (whose value should be either 'nat', 'routed_ipv4' or 'routed_ipv6')`,
Short: `Filter on the IP Mobility IP type (whose value should be either 'routed_ipv4', 'routed_ipv6' or 'nat')`,
Required: false,
Deprecated: false,
Positional: false,
Expand Down Expand Up @@ -3432,7 +3432,7 @@ func instanceIPCreate() *core.Command {
},
{
Name: "type",
Short: `IP type to reserve (either 'nat', 'routed_ipv4' or 'routed_ipv6')`,
Short: `IP type to reserve (either 'routed_ipv4' or 'routed_ipv6', use of 'nat' is deprecated)`,
Required: false,
Deprecated: false,
Positional: false,
Expand Down
Loading