Skip to content

Commit 9327d53

Browse files
scaleway-botremyleoneyfodil
authored and
Laure-di
committed
feat(containers): add VPC integration feature flag (scaleway#4736)
Co-authored-by: Rémy Léone <rleone@scaleway.com> Co-authored-by: Yacine FODIL <yfodil@scaleway.com> Co-authored-by: Yacine Fodil <105779815+yfodil@users.noreply.github.com>
1 parent 0d6c5c8 commit 9327d53

13 files changed

Lines changed: 7029 additions & 3739 deletions

‎cmd/scw/testdata/test-all-usage-container-container-create-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ARGS:
3131
[health-check.failure-threshold] Number of consecutive health check failures before considering the container unhealthy.
3232
[health-check.interval] Period between health checks.
3333
[tags.{index}] Tags of the Serverless Container
34+
[private-network-id]
3435
[deploy=true] Deploy container after creation
3536
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
3637

‎cmd/scw/testdata/test-all-usage-container-container-update-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ARGS:
3131
[health-check.failure-threshold] Number of consecutive health check failures before considering the container unhealthy.
3232
[health-check.interval] Period between health checks.
3333
[tags.{index}] Tags of the Serverless Container
34+
[private-network-id]
3435
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
3536

3637
DEPRECATED ARGS:

‎cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ARGS:
1313
[secret-environment-variables.{index}.key]
1414
[secret-environment-variables.{index}.value]
1515
[tags.{index}] Tags of the Serverless Container Namespace
16+
[activate-vpc-integration]
1617
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
1718

1819
FLAGS:

‎docs/commands/container.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ scw container container create [arg=value ...]
8686
| health-check.failure-threshold | | Number of consecutive health check failures before considering the container unhealthy. |
8787
| health-check.interval | | Period between health checks. |
8888
| tags.{index} | | Tags of the Serverless Container |
89+
| private-network-id | | |
8990
| deploy | Default: `true` | Deploy container after creation |
9091
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
9192

@@ -216,6 +217,7 @@ scw container container update <container-id ...> [arg=value ...]
216217
| health-check.failure-threshold | | Number of consecutive health check failures before considering the container unhealthy. |
217218
| health-check.interval | | Period between health checks. |
218219
| tags.{index} | | Tags of the Serverless Container |
220+
| private-network-id | | |
219221
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
220222

221223

@@ -477,6 +479,7 @@ scw container namespace create [arg=value ...]
477479
| secret-environment-variables.{index}.key | | |
478480
| secret-environment-variables.{index}.value | | |
479481
| tags.{index} | | Tags of the Serverless Container Namespace |
482+
| activate-vpc-integration | | |
480483
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
481484

482485

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.13.2
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250516160029-3f13aad4f58a
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.9.1
2929
github.com/spf13/pflag v1.0.6

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
466466
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
468468
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82 h1:HiThszq4WsYeLYznJjVm0RlsBw5uRalTPp3YEl5b0sc=
470-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250516160029-3f13aad4f58a h1:nqYV4PtTnMTGYqUe3mQI7qm26QxcO/Jy/pA5qCOgfH0=
470+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250516160029-3f13aad4f58a/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
471471
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
472472
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
473473
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

‎internal/namespaces/container/v1beta1/container_cli.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@ func containerNamespaceCreate() *core.Command {
277277
Deprecated: false,
278278
Positional: false,
279279
},
280+
{
281+
Name: "activate-vpc-integration",
282+
Required: false,
283+
Deprecated: false,
284+
Positional: false,
285+
},
280286
core.RegionArgSpec(
281287
scw.RegionFrPar,
282288
scw.RegionNlAms,
@@ -715,6 +721,12 @@ func containerContainerCreate() *core.Command {
715721
Deprecated: false,
716722
Positional: false,
717723
},
724+
{
725+
Name: "private-network-id",
726+
Required: false,
727+
Deprecated: false,
728+
Positional: false,
729+
},
718730
core.RegionArgSpec(
719731
scw.RegionFrPar,
720732
scw.RegionNlAms,
@@ -937,6 +949,12 @@ func containerContainerUpdate() *core.Command {
937949
Deprecated: false,
938950
Positional: false,
939951
},
952+
{
953+
Name: "private-network-id",
954+
Required: false,
955+
Deprecated: false,
956+
Positional: false,
957+
},
940958
core.RegionArgSpec(
941959
scw.RegionFrPar,
942960
scw.RegionNlAms,

0 commit comments

Comments
 (0)