Merge pull request #112026 from pacoxu/kubeadm-update-system-validators

upgrade system-validators to v1.8.0 for a bugfix of cgroupv2 io check
This commit is contained in:
Kubernetes Prow Robot
2022-08-25 07:28:30 -07:00
committed by GitHub
4 changed files with 12 additions and 8 deletions

View File

@@ -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\..*`},

4
vendor/modules.txt vendored
View File

@@ -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