Skip to content

Commit e38f27a

Browse files
authored
feat(serverless_jobs): add local storage limit (#3658)
1 parent 5404b0c commit e38f27a

File tree

6 files changed

+27
-9
lines changed

6 files changed

+27
-9
lines changed

cmd/scw/testdata/test-all-usage-jobs-definition-create-usage.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ USAGE:
88
ARGS:
99
name=<generated> Name of the job definition
1010
cpu-limit CPU limit of the job
11-
memory-limit Memory limit of the job
11+
memory-limit Memory limit of the job (in MiB)
12+
[local-storage-capacity] Local storage capacity of the job (in MiB)
1213
[image-uri] Image to use for the job
1314
[command] Startup command
1415
[project-id] Project ID to use. If none is passed the default project ID will be used

cmd/scw/testdata/test-all-usage-jobs-definition-update-usage.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ ARGS:
99
job-definition-id UUID of the job definition to update
1010
[name] Name of the job definition
1111
[cpu-limit] CPU limit of the job
12-
[memory-limit] Memory limit of the job
12+
[memory-limit] Memory limit of the job (in MiB)
13+
[local-storage-capacity] Local storage capacity of the job (in MiB)
1314
[image-uri] Image to use for the job
1415
[command] Startup command
1516
[environment-variables.{key}] Environment variables of the job

docs/commands/jobs.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ scw jobs definition create [arg=value ...]
3838
|------|---|-------------|
3939
| name | Required<br />Default: `<generated>` | Name of the job definition |
4040
| cpu-limit | Required | CPU limit of the job |
41-
| memory-limit | Required | Memory limit of the job |
41+
| memory-limit | Required | Memory limit of the job (in MiB) |
42+
| local-storage-capacity | | Local storage capacity of the job (in MiB) |
4243
| image-uri | | Image to use for the job |
4344
| command | | Startup command |
4445
| project-id | | Project ID to use. If none is passed the default project ID will be used |
@@ -153,7 +154,8 @@ scw jobs definition update <job-definition-id ...> [arg=value ...]
153154
| job-definition-id | Required | UUID of the job definition to update |
154155
| name | | Name of the job definition |
155156
| cpu-limit | | CPU limit of the job |
156-
| memory-limit | | Memory limit of the job |
157+
| memory-limit | | Memory limit of the job (in MiB) |
158+
| local-storage-capacity | | Local storage capacity of the job (in MiB) |
157159
| image-uri | | Image to use for the job |
158160
| command | | Startup command |
159161
| environment-variables.{key} | | Environment variables of the job |

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/moby/buildkit v0.11.6
2525
github.com/opencontainers/go-digest v1.0.0
2626
github.com/pkg/errors v0.9.1
27-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240206155451-64fcc5bbab4d
27+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240213135046-844b67c59145
2828
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2929
github.com/spf13/cobra v1.8.0
3030
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
392392
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
393393
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
394394
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
395-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240206155451-64fcc5bbab4d h1:F4MeCGwhzSBwEIdTNh8qtVg5o91qV2N7cFeDv5BBTyQ=
396-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240206155451-64fcc5bbab4d/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
395+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240213135046-844b67c59145 h1:oC363DWOxN7AN11KO/fdMprXKrGO1pixAtCCOYpUfjk=
396+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.23.0.20240213135046-844b67c59145/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
397397
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
398398
github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
399399
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

internal/namespaces/jobs/v1alpha1/jobs_cli.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,18 @@ func jobsDefinitionCreate() *core.Command {
8686
},
8787
{
8888
Name: "memory-limit",
89-
Short: `Memory limit of the job`,
89+
Short: `Memory limit of the job (in MiB)`,
9090
Required: true,
9191
Deprecated: false,
9292
Positional: false,
9393
},
94+
{
95+
Name: "local-storage-capacity",
96+
Short: `Local storage capacity of the job (in MiB)`,
97+
Required: false,
98+
Deprecated: false,
99+
Positional: false,
100+
},
94101
{
95102
Name: "image-uri",
96103
Short: `Image to use for the job`,
@@ -260,7 +267,14 @@ func jobsDefinitionUpdate() *core.Command {
260267
},
261268
{
262269
Name: "memory-limit",
263-
Short: `Memory limit of the job`,
270+
Short: `Memory limit of the job (in MiB)`,
271+
Required: false,
272+
Deprecated: false,
273+
Positional: false,
274+
},
275+
{
276+
Name: "local-storage-capacity",
277+
Short: `Local storage capacity of the job (in MiB)`,
264278
Required: false,
265279
Deprecated: false,
266280
Positional: false,

0 commit comments

Comments
 (0)