Merge pull request #1332 from bg-chun/update_cri_for_hugepages

update cri-plugin to parse hugepages limit

pkg/containerd/opts/spec_unix.go

@@ -423,10 +423,11 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts {
 			s.Linux.Resources.Memory = &runtimespec.LinuxMemory{}
 		}
 		var (
-			p      = uint64(resources.GetCpuPeriod())
-			q      = resources.GetCpuQuota()
-			shares = uint64(resources.GetCpuShares())
-			limit  = resources.GetMemoryLimitInBytes()
+			p         = uint64(resources.GetCpuPeriod())
+			q         = resources.GetCpuQuota()
+			shares    = uint64(resources.GetCpuShares())
+			limit     = resources.GetMemoryLimitInBytes()
+			hugepages = resources.GetHugepageLimits()
 		)
 
 		if p != 0 {
@@ -447,6 +448,12 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts {
 		if limit != 0 {
 			s.Linux.Resources.Memory.Limit = &limit
 		}
+		for _, limit := range hugepages {
+			s.Linux.Resources.HugepageLimits = append(s.Linux.Resources.HugepageLimits, runtimespec.LinuxHugepageLimit{
+				Pagesize: limit.PageSize,
+				Limit:    limit.Limit,
+			})
+		}
 		return nil
 	}
 }

vendor.conf

@@ -60,13 +60,13 @@ github.com/cilium/ebpf 60c3aa43f488292fe2ee50fb8b833b383ca8ebbb
 # kubernetes dependencies
 sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0
 k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
-k8s.io/kubernetes v1.17.1
+k8s.io/kubernetes v1.18.0-alpha.1
 k8s.io/klog v1.0.0
-k8s.io/cri-api kubernetes-1.17.1
-k8s.io/client-go kubernetes-1.17.1
-k8s.io/api kubernetes-1.17.1
-k8s.io/apiserver kubernetes-1.17.1
-k8s.io/apimachinery kubernetes-1.17.1
+k8s.io/cri-api kubernetes-1.18.0-alpha.1
+k8s.io/client-go kubernetes-1.18.0-alpha.1
+k8s.io/api kubernetes-1.18.0-alpha.1
+k8s.io/apiserver kubernetes-1.18.0-alpha.1
+k8s.io/apimachinery kubernetes-1.18.0-alpha.1
 gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8
 gopkg.in/inf.v0 v0.9.1
 golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef