diff --git a/info/v2/container.go b/info/v2/container.go index 326c9ce0..6ba37699 100644 --- a/info/v2/container.go +++ b/info/v2/container.go @@ -72,6 +72,11 @@ type ContainerSpec struct { HasMemory bool `json:"has_memory"` Memory MemorySpec `json:"memory,omitempty"` + + // Following resources have no associated spec, but are being isolated. + HasNetwork bool `json:"has_network"` + HasFilesystem bool `json:"has_filesystem"` + HasDiskIo bool `json:"has_diskio"` } type ContainerStats struct { diff --git a/manager/manager.go b/manager/manager.go index e5e30952..3f4a39e9 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -361,9 +361,12 @@ func (self *manager) GetContainerSpec(containerName string, options v2.RequestOp func (self *manager) getV2Spec(cinfo *containerInfo) v2.ContainerSpec { specV1 := self.getAdjustedSpec(cinfo) specV2 := v2.ContainerSpec{ - CreationTime: specV1.CreationTime, - HasCpu: specV1.HasCpu, - HasMemory: specV1.HasMemory, + CreationTime: specV1.CreationTime, + HasCpu: specV1.HasCpu, + HasMemory: specV1.HasMemory, + HasFilesystem: specV1.HasFilesystem, + HasNetwork: specV1.HasNetwork, + HasDiskIo: specV1.HasDiskIo, } if specV1.HasCpu { specV2.Cpu.Limit = specV1.Cpu.Limit