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

thaJeztah · thaJeztah · commit cb9d2cb71b92 · 2018-10-26T15:39:36.000+02:00
This feature was added in 14da20f, 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>
diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go
@@ -186,10 +186,10 @@ func (sr *swarmRouter) createService(ctx context.Context, w http.ResponseWriter,
 		if versions.LessThan(cliVersion, "1.30") {
 			queryRegistry = true
 		}
-		if versions.LessThan(cliVersion, "1.39") {
+		if versions.LessThan(cliVersion, "1.40") {
 			if service.TaskTemplate.ContainerSpec != nil {
 				// Sysctls for docker swarm services weren't supported before
-				// API version 1.39
+				// API version 1.40
 				service.TaskTemplate.ContainerSpec.Sysctls = nil
 			}
 		}
@@ -229,10 +229,10 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,
 		if versions.LessThan(cliVersion, "1.30") {
 			queryRegistry = true
 		}
-		if versions.LessThan(cliVersion, "1.39") {
+		if versions.LessThan(cliVersion, "1.40") {
 			if service.TaskTemplate.ContainerSpec != nil {
 				// Sysctls for docker swarm services weren't supported before
-				// API version 1.39
+				// API version 1.40
 				service.TaskTemplate.ContainerSpec.Sysctls = nil
 			}
 		}
diff --git a/docs/api/version-history.md b/docs/api/version-history.md
@@ -17,6 +17,12 @@ keywords: "API, Docker, rcli, REST, documentation"
 
 [Docker Engine API v1.40](https://docs.docker.com/engine/api/v1.40/) documentation
 
+* `GET /services` now returns `Sysctls` as part of the `ContainerSpec`.
+* `GET /services/{id}` now returns `Sysctls` as part of the `ContainerSpec`.
+* `POST /services/create` now accepts `Sysctls` as part of the `ContainerSpec`.
+* `POST /services/{id}/update` now accepts `Sysctls` as part of the `ContainerSpec`.
+* `GET /tasks` now  returns `Sysctls` as part of the `ContainerSpec`.
+* `GET /tasks/{id}` now  returns `Sysctls` as part of the `ContainerSpec`.
 
 ## V1.39 API changes
 
@@ -35,12 +41,6 @@ keywords: "API, Docker, rcli, REST, documentation"
   on the node.label. The format of the label filter is `node.label=<key>`/`node.label=<key>=<value>`
   to return those with the specified labels, or `node.label!=<key>`/`node.label!=<key>=<value>`
   to return those without the specified labels.
-* `GET /services` now returns `Sysctls` as part of the `ContainerSpec`.
-* `GET /services/{id}` now returns `Sysctls` as part of the `ContainerSpec`.
-* `POST /services/create` now accepts `Sysctls` as part of the `ContainerSpec`.
-* `POST /services/{id}/update` now accepts `Sysctls` as part of the `ContainerSpec`.
-* `GET /tasks` now  returns `Sysctls` as part of the `ContainerSpec`.
-* `GET /tasks/{id}` now  returns `Sysctls` as part of the `ContainerSpec`.
 
 ## V1.38 API changes
 
diff --git a/integration/service/create_test.go b/integration/service/create_test.go
@@ -339,8 +339,8 @@ func TestCreateServiceConfigFileMode(t *testing.T) {
 // anything up in the test environment
 func TestCreateServiceSysctls(t *testing.T) {
 	skip.If(
-		t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.39"),
-		"setting service sysctls is unsupported before api v1.39",
+		t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"),
+		"setting service sysctls is unsupported before api v1.40",
 	)
 
 	defer setupTest(t)()

Original file line number	Diff line number	Diff line change
`@@ -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`	`}`