From 7d50271d217ca378f3e8c06bce26627689ae8932 Mon Sep 17 00:00:00 2001 From: Elana Hashman Date: Tue, 15 Jun 2021 16:19:43 -0700 Subject: [PATCH] Update CRI with memory_swap_limit_in_bytes --- staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto | 2 ++ staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto | 2 ++ 2 files changed, 4 insertions(+) diff --git a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto index afeec456305..6556003921c 100644 --- a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto +++ b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto @@ -583,6 +583,8 @@ message LinuxContainerResources { // Each key/value in the map refers to the cgroup v2. // e.g. "memory.max": "6937202688" or "io.weight": "default 100". map unified = 9; + // Memory swap limit in bytes. Default 0 (not specified). + int64 memory_swap_limit_in_bytes = 10; } // HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup. diff --git a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto index d25958beef6..1e579187f96 100644 --- a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto +++ b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto @@ -589,6 +589,8 @@ message LinuxContainerResources { // Each key/value in the map refers to the cgroup v2. // e.g. "memory.max": "6937202688" or "io.weight": "default 100". map unified = 9; + // Memory swap limit in bytes. Default 0 (not specified). + int64 memory_swap_limit_in_bytes = 10; } // HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup.