Add support for pids limit in stacks (swarm)

thaJeztah · thaJeztah · commit 851eeb9639dd · 2020-06-18T21:25:08.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/stack/kubernetes/convert.go b/cli/command/stack/kubernetes/convert.go
@@ -489,11 +489,22 @@ func fromComposeConstraints(s []string) *latest.Constraints {
 
 func fromComposeResources(r composeTypes.Resources) latest.Resources {
 	return latest.Resources{
-		Limits:       fromComposeResourcesResource(r.Limits),
+		Limits:       fromComposeResourcesResourceLimit(r.Limits),
 		Reservations: fromComposeResourcesResource(r.Reservations),
 	}
 }
 
+// TODO create ResourceLimit type and support for limiting Pids on k8s
+func fromComposeResourcesResourceLimit(r *composeTypes.ResourceLimit) *latest.Resource {
+	if r == nil {
+		return nil
+	}
+	return &latest.Resource{
+		MemoryBytes: int64(r.MemoryBytes),
+		NanoCPUs:    r.NanoCPUs,
+	}
+}
+
 func fromComposeResourcesResource(r *composeTypes.Resource) *latest.Resource {
 	if r == nil {
 		return nil
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -534,6 +534,7 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
 		resources.Limits = &swarm.Limit{
 			NanoCPUs:    cpus,
 			MemoryBytes: int64(source.Limits.MemoryBytes),
+			Pids:        source.Limits.Pids,
 		}
 	}
 	if source.Reservations != nil {
diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go
@@ -74,7 +74,7 @@ func TestConvertExtraHosts(t *testing.T) {
 
 func TestConvertResourcesFull(t *testing.T) {
 	source := composetypes.Resources{
-		Limits: &composetypes.Resource{
+		Limits: &composetypes.ResourceLimit{
 			NanoCPUs:    "0.003",
 			MemoryBytes: composetypes.UnitBytes(300000000),
 		},
@@ -101,7 +101,7 @@ func TestConvertResourcesFull(t *testing.T) {
 
 func TestConvertResourcesOnlyMemory(t *testing.T) {
 	source := composetypes.Resources{
-		Limits: &composetypes.Resource{
+		Limits: &composetypes.ResourceLimit{
 			MemoryBytes: composetypes.UnitBytes(300000000),
 		},
 		Reservations: &composetypes.Resource{
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -68,6 +68,7 @@ services:
         limits:
           cpus: '0.001'
           memory: 50M
+          pids: 100
         reservations:
           cpus: '0.0001'
           memory: 20M
diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
@@ -84,9 +84,10 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 					Order:           "start-first",
 				},
 				Resources: types.Resources{
-					Limits: &types.Resource{
+					Limits: &types.ResourceLimit{
 						NanoCPUs:    "0.001",
 						MemoryBytes: 50 * 1024 * 1024,
+						Pids:        100,
 					},
 					Reservations: &types.Resource{
 						NanoCPUs:    "0.0001",
@@ -581,6 +582,7 @@ services:
         limits:
           cpus: "0.001"
           memory: "52428800"
+          pids: 100
         reservations:
           cpus: "0.0001"
           memory: "20971520"
@@ -1070,7 +1072,8 @@ func fullExampleJSON(workingDir string) string {
         "resources": {
           "limits": {
             "cpus": "0.001",
-            "memory": "52428800"
+            "memory": "52428800",
+            "pids": 100
           },
           "reservations": {
             "cpus": "0.0001",
diff --git a/cli/compose/loader/types_test.go b/cli/compose/loader/types_test.go
@@ -20,7 +20,7 @@ func TestMarshallConfig(t *testing.T) {
 	assert.Check(t, is.Equal(expected, string(actual)))
 
 	// Make sure the expected still
-	dict, err := ParseYAML([]byte("version: '3.7'\n" + expected))
+	dict, err := ParseYAML([]byte("version: '3.9'\n" + expected))
 	assert.NilError(t, err)
 	_, err = Load(buildConfigDetails(dict, map[string]string{}))
 	assert.NilError(t, err)
diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.9.json b/cli/compose/schema/data/config_schema_v3.9.json
@@ -392,7 +392,8 @@
               "type": "object",
               "properties": {
                 "cpus": {"type": "string"},
-                "memory": {"type": "string"}
+                "memory": {"type": "string"},
+                "pids": {"type": "integer"}
               },
               "additionalProperties": false
             },
diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -302,11 +302,19 @@ type UpdateConfig struct {
 
 // Resources the resource limits and reservations
 type Resources struct {
-	Limits       *Resource `yaml:",omitempty" json:"limits,omitempty"`
-	Reservations *Resource `yaml:",omitempty" json:"reservations,omitempty"`
+	Limits       *ResourceLimit `yaml:",omitempty" json:"limits,omitempty"`
+	Reservations *Resource      `yaml:",omitempty" json:"reservations,omitempty"`
 }
 
-// Resource is a resource to be limited or reserved
+// ResourceLimit is a resource to be limited
+type ResourceLimit struct {
+	// TODO: types to convert from units and ratios
+	NanoCPUs    string    `mapstructure:"cpus" yaml:"cpus,omitempty" json:"cpus,omitempty"`
+	MemoryBytes UnitBytes `mapstructure:"memory" yaml:"memory,omitempty" json:"memory,omitempty"`
+	Pids        int64     `mapstructure:"pids" yaml:"pids,omitempty" json:"pids,omitempty"`
+}
+
+// Resource is a resource to be reserved
 type Resource struct {
 	// TODO: types to convert from units and ratios
 	NanoCPUs         string            `mapstructure:"cpus" yaml:"cpus,omitempty" json:"cpus,omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -534,6 +534,7 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement`
`534`	`534`	`resources.Limits = &swarm.Limit{`
`535`	`535`	`NanoCPUs: cpus,`
`536`	`536`	`MemoryBytes: int64(source.Limits.MemoryBytes),`
	`537`	`+ Pids: source.Limits.Pids,`
`537`	`538`	`}`
`538`	`539`	`}`
`539`	`540`	`if source.Reservations != nil {`