mirror of https://github.com/docker/cli.git
Fix parsing resources from compose file for stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
fa1b74a77e
commit
c2f0402f4d
|
@ -263,21 +263,28 @@ func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig
|
||||||
|
|
||||||
func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) {
|
func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) {
|
||||||
resources := &swarm.ResourceRequirements{}
|
resources := &swarm.ResourceRequirements{}
|
||||||
|
var err error
|
||||||
if source.Limits != nil {
|
if source.Limits != nil {
|
||||||
cpus, err := opts.ParseCPUs(source.Limits.NanoCPUs)
|
var cpus int64
|
||||||
|
if source.Limits.NanoCPUs != "" {
|
||||||
|
cpus, err = opts.ParseCPUs(source.Limits.NanoCPUs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
}
|
||||||
resources.Limits = &swarm.Resources{
|
resources.Limits = &swarm.Resources{
|
||||||
NanoCPUs: cpus,
|
NanoCPUs: cpus,
|
||||||
MemoryBytes: int64(source.Limits.MemoryBytes),
|
MemoryBytes: int64(source.Limits.MemoryBytes),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if source.Reservations != nil {
|
if source.Reservations != nil {
|
||||||
cpus, err := opts.ParseCPUs(source.Reservations.NanoCPUs)
|
var cpus int64
|
||||||
|
if source.Reservations.NanoCPUs != "" {
|
||||||
|
cpus, err = opts.ParseCPUs(source.Reservations.NanoCPUs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
}
|
||||||
resources.Reservations = &swarm.Resources{
|
resources.Reservations = &swarm.Resources{
|
||||||
NanoCPUs: cpus,
|
NanoCPUs: cpus,
|
||||||
MemoryBytes: int64(source.Reservations.MemoryBytes),
|
MemoryBytes: int64(source.Reservations.MemoryBytes),
|
||||||
|
|
|
@ -80,6 +80,29 @@ func TestConvertResourcesFull(t *testing.T) {
|
||||||
assert.DeepEqual(t, resources, expected)
|
assert.DeepEqual(t, resources, expected)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestConvertResourcesOnlyMemory(t *testing.T) {
|
||||||
|
source := composetypes.Resources{
|
||||||
|
Limits: &composetypes.Resource{
|
||||||
|
MemoryBytes: composetypes.UnitBytes(300000000),
|
||||||
|
},
|
||||||
|
Reservations: &composetypes.Resource{
|
||||||
|
MemoryBytes: composetypes.UnitBytes(200000000),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
resources, err := convertResources(source)
|
||||||
|
assert.NilError(t, err)
|
||||||
|
|
||||||
|
expected := &swarm.ResourceRequirements{
|
||||||
|
Limits: &swarm.Resources{
|
||||||
|
MemoryBytes: 300000000,
|
||||||
|
},
|
||||||
|
Reservations: &swarm.Resources{
|
||||||
|
MemoryBytes: 200000000,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
assert.DeepEqual(t, resources, expected)
|
||||||
|
}
|
||||||
|
|
||||||
func TestConvertHealthcheck(t *testing.T) {
|
func TestConvertHealthcheck(t *testing.T) {
|
||||||
retries := uint64(10)
|
retries := uint64(10)
|
||||||
source := &composetypes.HealthCheckConfig{
|
source := &composetypes.HealthCheckConfig{
|
||||||
|
|
Loading…
Reference in New Issue