1. docker
  2. Commit cb9d2cb71b9265af566fcaace0e52dca54520288
Browse code

Move support for sysctl options in services to API v1.40

This feature was added in 14da20f5e79fc322208ec49edce34e0b575d8973,
and was merged after API v1.39 shipped as part of the Docker 18.09
release candidates.

This commit moves the feature to the correct API version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2018/10/26 22:39:36
Showing 3 changed files
api/server/router/swarm/cluster_routes.go
History View file @ cb9d2cb
... ... 
@@ -186,10 +186,10 @@ func (sr *swarmRouter) createService(ctx context.Context, w http.ResponseWriter,
186 186 
 		if versions.LessThan(cliVersion, "1.30") {
187 187 
 			queryRegistry = true
188 188 
 		}
189 
-		if versions.LessThan(cliVersion, "1.39") {
189 
+		if versions.LessThan(cliVersion, "1.40") {
190 190 
 			if service.TaskTemplate.ContainerSpec != nil {
191 191 
 				// Sysctls for docker swarm services weren't supported before
192 
-				// API version 1.39
192 
+				// API version 1.40
193 193 
 				service.TaskTemplate.ContainerSpec.Sysctls = nil
194 194 
 			}
195 195 
 		}
... ... 
@@ -229,10 +229,10 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,
229 229 
 		if versions.LessThan(cliVersion, "1.30") {
230 230 
 			queryRegistry = true
231 231 
 		}
232 
-		if versions.LessThan(cliVersion, "1.39") {
232 
+		if versions.LessThan(cliVersion, "1.40") {
233 233 
 			if service.TaskTemplate.ContainerSpec != nil {
234 234 
 				// Sysctls for docker swarm services weren't supported before
235 
-				// API version 1.39
235 
+				// API version 1.40
236 236 
 				service.TaskTemplate.ContainerSpec.Sysctls = nil
237 237 
 			}
238 238 
 		}
docs/api/version-history.md
History View file @ cb9d2cb
... ... 
@@ -17,6 +17,12 @@ keywords: "API, Docker, rcli, REST, documentation"
17 17
18 18 
 [Docker Engine API v1.40](https://docs.docker.com/engine/api/v1.40/) documentation
19 19
20 
+* `GET /services` now returns `Sysctls` as part of the `ContainerSpec`.
21 
+* `GET /services/{id}` now returns `Sysctls` as part of the `ContainerSpec`.
22 
+* `POST /services/create` now accepts `Sysctls` as part of the `ContainerSpec`.
23 
+* `POST /services/{id}/update` now accepts `Sysctls` as part of the `ContainerSpec`.
24 
+* `GET /tasks` now  returns `Sysctls` as part of the `ContainerSpec`.
25 
+* `GET /tasks/{id}` now  returns `Sysctls` as part of the `ContainerSpec`.
20 26
21 27 
 ## V1.39 API changes
22 28
... ... 
@@ -35,12 +41,6 @@ keywords: "API, Docker, rcli, REST, documentation"
35 35 
   on the node.label. The format of the label filter is `node.label=<key>`/`node.label=<key>=<value>`
36 36 
   to return those with the specified labels, or `node.label!=<key>`/`node.label!=<key>=<value>`
37 37 
   to return those without the specified labels.
38 
-* `GET /services` now returns `Sysctls` as part of the `ContainerSpec`.
39 
-* `GET /services/{id}` now returns `Sysctls` as part of the `ContainerSpec`.
40 
-* `POST /services/create` now accepts `Sysctls` as part of the `ContainerSpec`.
41 
-* `POST /services/{id}/update` now accepts `Sysctls` as part of the `ContainerSpec`.
42 
-* `GET /tasks` now  returns `Sysctls` as part of the `ContainerSpec`.
43 
-* `GET /tasks/{id}` now  returns `Sysctls` as part of the `ContainerSpec`.
44 38
45 39 
 ## V1.38 API changes
46 40
integration/service/create_test.go
History View file @ cb9d2cb
... ... 
@@ -339,8 +339,8 @@ func TestCreateServiceConfigFileMode(t *testing.T) {
339 339 
 // anything up in the test environment
340 340 
 func TestCreateServiceSysctls(t *testing.T) {
341 341 
 	skip.If(
342 
-		t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.39"),
343 
-		"setting service sysctls is unsupported before api v1.39",
342 
+		t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"),
343 
+		"setting service sysctls is unsupported before api v1.40",
344 344 
 	)
345 345
346 346 
 	defer setupTest(t)()