浏览代码

Merge pull request #9947 from glours/manage-resources-reservations

add support of deploy.reservation.memory
Laura Brehm 3 年之前
父节点
当前提交
df9e605b31
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      pkg/compose/create.go

+ 6 - 0
pkg/compose/create.go

@@ -592,6 +592,12 @@ func setReservations(reservations *types.Resource, resources *container.Resource
 	if reservations == nil {
 		return
 	}
+	// Cpu reservation is a swarm option and PIDs is only a limit
+	// So we only need to map memory reservation and devices
+	if reservations.MemoryBytes != 0 {
+		resources.MemoryReservation = int64(reservations.MemoryBytes)
+	}
+
 	for _, device := range reservations.Devices {
 		resources.DeviceRequests = append(resources.DeviceRequests, container.DeviceRequest{
 			Capabilities: [][]string{device.Capabilities},