From 75b7e2346ca87b6ed6d95705c88f40eb89640bf3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 7 Nov 2025 15:45:22 +0100 Subject: [PATCH] cli/compose: memswap_limit -> memory_swap, mem_swappiness -> memory_swappiness Align the names in the compose / stack schema with the command-line flags, instead of aligning with the existing options in the compose-schema (which I think originated from v1); https://github.com/compose-spec/compose-spec/blob/a08f8d51631b7127ddac3d2c65537db429d0f1d0/spec.md?plain=1#L1440-L1461 Signed-off-by: Sebastiaan van Stijn --- cli/compose/loader/full-example.yml | 4 ++-- cli/compose/loader/testdata/full-example.json.golden | 4 ++-- cli/compose/loader/testdata/full-example.yaml.golden | 4 ++-- cli/compose/schema/data/config_schema_v3.14.json | 4 ++-- cli/compose/types/types.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml index 0a008fe5c7b7..3a38be1f2081 100644 --- a/cli/compose/loader/full-example.yml +++ b/cli/compose/loader/full-example.yml @@ -79,8 +79,8 @@ services: - discrete_resource_spec: kind: 'ssd' value: 1 - memswap_limit: 86000 - mem_swappiness: 27 + memory_swap: 86000 + memory_swappiness: 27 restart_policy: condition: on-failure delay: 5s diff --git a/cli/compose/loader/testdata/full-example.json.golden b/cli/compose/loader/testdata/full-example.json.golden index 4f0a08d97009..12a919e63905 100644 --- a/cli/compose/loader/testdata/full-example.json.golden +++ b/cli/compose/loader/testdata/full-example.json.golden @@ -182,8 +182,8 @@ } ] }, - "memswap_limit": 86000, - "mem_swappiness": 27 + "memory_swap": 86000, + "memory_swappiness": 27 }, "restart_policy": { "condition": "on-failure", diff --git a/cli/compose/loader/testdata/full-example.yaml.golden b/cli/compose/loader/testdata/full-example.yaml.golden index a69b7d2f31e3..ccfff1b994e1 100644 --- a/cli/compose/loader/testdata/full-example.yaml.golden +++ b/cli/compose/loader/testdata/full-example.yaml.golden @@ -73,8 +73,8 @@ services: - discrete_resource_spec: kind: ssd value: 1 - memswap_limit: 86000 - mem_swappiness: 27 + memory_swap: 86000 + memory_swappiness: 27 restart_policy: condition: on-failure delay: 5s diff --git a/cli/compose/schema/data/config_schema_v3.14.json b/cli/compose/schema/data/config_schema_v3.14.json index 5189f8d0186f..4a8d74d07bfc 100644 --- a/cli/compose/schema/data/config_schema_v3.14.json +++ b/cli/compose/schema/data/config_schema_v3.14.json @@ -414,10 +414,10 @@ }, "additionalProperties": false }, - "memswap_limit": { + "memory_swap": { "type": "integer" }, - "mem_swappiness": { + "memory_swappiness": { "type": "integer" } }, diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go index a55eec1d2a93..52ec8aa96774 100644 --- a/cli/compose/types/types.go +++ b/cli/compose/types/types.go @@ -309,8 +309,8 @@ type UpdateConfig struct { type Resources struct { Limits *ResourceLimit `yaml:",omitempty" json:"limits,omitempty"` Reservations *Resource `yaml:",omitempty" json:"reservations,omitempty"` - MemswapLimit *int64 `mapstructure:"memswap_limit" yaml:"memswap_limit,omitempty" json:"memswap_limit,omitempty"` - MemSwappiness *int64 `mapstructure:"mem_swappiness" yaml:"mem_swappiness,omitempty" json:"mem_swappiness,omitempty"` + MemswapLimit *int64 `mapstructure:"memory_swap" yaml:"memory_swap,omitempty" json:"memory_swap,omitempty"` + MemSwappiness *int64 `mapstructure:"memory_swappiness" yaml:"memory_swappiness,omitempty" json:"memory_swappiness,omitempty"` } // ResourceLimit is a resource to be limited