Merge pull request #1406 from egernst/fix-ctr-cpuset

runtime: cpuset: when creating container, don't pass cpuset details
This commit is contained in:
Bo Chen 2021-02-11 22:31:44 -08:00 committed by GitHub
commit 14bb24e4ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -964,6 +964,10 @@ func (k *kataAgent) constraintGRPCSpec(grpcSpec *grpc.Spec, passSeccomp bool) {
grpcSpec.Linux.Resources.BlockIO = nil
grpcSpec.Linux.Resources.HugepageLimits = nil
grpcSpec.Linux.Resources.Network = nil
if grpcSpec.Linux.Resources.CPU != nil {
grpcSpec.Linux.Resources.CPU.Cpus = ""
grpcSpec.Linux.Resources.CPU.Mems = ""
}
// There are three main reasons to do not apply systemd cgroups in the VM
// - Initrd image doesn't have systemd.