deep-stack/kompose
4
0 Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge will include deploy resources (#1214)

Browse Source
This commit is contained in:
Hang Yan authored and GitHub committed 2019-12-27 13:51:11 +08:00
1 parent a3a82f55fe
commit d2d0d61cf2
3 files changed
+22 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/loader/compose/v3.go
+8
View File
@@ -555,6 +555,14 @@ func mergeComposeObject(oldCompose *types.Config, newCompose *types.Config) (*ty
if service.Deploy.Mode != "" {
tmpOldService.Deploy = service.Deploy
}
if service.Deploy.Resources.Limits != nil {
tmpOldService.Deploy.Resources.Limits = service.Deploy.Resources.Limits
}
if service.Deploy.Resources.Reservations != nil {
tmpOldService.Deploy.Resources.Reservations = service.Deploy.Resources.Reservations
}
if len(service.Devices) != 0 {
tmpOldService.Devices = service.Devices
}