diff --git a/go.mod b/go.mod index 01bb93bd112..5d8a8cd846c 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( k8s.io/mount-utils v0.0.0 k8s.io/pod-security-admission v0.0.0 k8s.io/sample-apiserver v0.0.0 - k8s.io/system-validators v1.7.0 + k8s.io/system-validators v1.8.0 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed sigs.k8s.io/structured-merge-diff/v4 v4.2.3 sigs.k8s.io/yaml v1.2.0 @@ -592,7 +592,7 @@ replace ( k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller - k8s.io/system-validators => k8s.io/system-validators v1.7.0 + k8s.io/system-validators => k8s.io/system-validators v1.8.0 k8s.io/utils => k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed modernc.org/cc => modernc.org/cc v1.0.0 modernc.org/golex => modernc.org/golex v1.0.0 diff --git a/go.sum b/go.sum index e8b1488b178..85ed9c917bc 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/system-validators v1.7.0 h1:tYD3hojdYc58CKtiEsh7BWW6Pg0x6xbclUiwjaIiiYo= -k8s.io/system-validators v1.7.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= +k8s.io/system-validators v1.8.0 h1:tq05tdO9zdJZnNF3SXrq6LE7Knc/KfJm5wk68467JDg= +k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= diff --git a/vendor/k8s.io/system-validators/validators/types_unix.go b/vendor/k8s.io/system-validators/validators/types_unix.go index 81023124176..b70947fed31 100644 --- a/vendor/k8s.io/system-validators/validators/types_unix.go +++ b/vendor/k8s.io/system-validators/validators/types_unix.go @@ -72,8 +72,12 @@ var DefaultSysSpec = SysSpec{ // Containerd and cri-o will use blkio to track disk I/O and throttling in both cgroup v1 and v2. "blkio", }, - CgroupsV2: []string{"cpu", "cpuset", "devices", "freezer", "memory", "pids"}, - CgroupsV2Optional: []string{"hugetlb", "blkio"}, + CgroupsV2: []string{"cpu", "cpuset", "devices", "freezer", "memory", "pids"}, + CgroupsV2Optional: []string{ + "hugetlb", + // The cgroups v2 io controller is the successor of the v1 blkio controller. + "io", + }, RuntimeSpec: RuntimeSpec{ DockerSpec: &DockerSpec{ Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`, `20\.10\..*`}, diff --git a/vendor/modules.txt b/vendor/modules.txt index 37012e648e5..e2abfcd8d3f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2397,7 +2397,7 @@ k8s.io/sample-apiserver/pkg/generated/openapi k8s.io/sample-apiserver/pkg/registry k8s.io/sample-apiserver/pkg/registry/wardle/fischer k8s.io/sample-apiserver/pkg/registry/wardle/flunder -# k8s.io/system-validators v1.7.0 => k8s.io/system-validators v1.7.0 +# k8s.io/system-validators v1.8.0 => k8s.io/system-validators v1.8.0 ## explicit; go 1.16 k8s.io/system-validators/validators # k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed => k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed @@ -2857,7 +2857,7 @@ sigs.k8s.io/yaml # k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver # k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin # k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller -# k8s.io/system-validators => k8s.io/system-validators v1.7.0 +# k8s.io/system-validators => k8s.io/system-validators v1.8.0 # k8s.io/utils => k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed # modernc.org/cc => modernc.org/cc v1.0.0 # modernc.org/golex => modernc.org/golex v1.0.0