From b03418cb44ee1faea3df00d485bb2af2d7ed8e82 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 2 Mar 2021 21:44:14 +0200 Subject: [PATCH] gomod/vendor: update system-validators to v1.4.0 Includes a Docker bump to 20.10. --- go.mod | 4 ++-- go.sum | 4 ++-- .../k8s.io/system-validators/validators/docker_validator.go | 2 +- vendor/k8s.io/system-validators/validators/types_unix.go | 2 +- vendor/k8s.io/system-validators/validators/types_windows.go | 2 +- vendor/modules.txt | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a3c4e954577..fb24993cfd7 100644 --- a/go.mod +++ b/go.mod @@ -138,7 +138,7 @@ require ( k8s.io/metrics v0.0.0 k8s.io/mount-utils v0.0.0 k8s.io/sample-apiserver v0.0.0 - k8s.io/system-validators v1.3.0 + k8s.io/system-validators v1.4.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) @@ -517,7 +517,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.3.0 + k8s.io/system-validators => k8s.io/system-validators v1.4.0 k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920 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 d8226825422..d342cd2a5da 100644 --- a/go.sum +++ b/go.sum @@ -583,8 +583,8 @@ k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/system-validators v1.3.0 h1:cv6KVP47v1sr8IaN12Le+jCX01HABSpmZBCr8C4A8RM= -k8s.io/system-validators v1.3.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= +k8s.io/system-validators v1.4.0 h1:8ruXIHkuTAGfv9rHJproNWFW8oLASThFkCOxeHPYkNU= +k8s.io/system-validators v1.4.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/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/docker_validator.go b/vendor/k8s.io/system-validators/validators/docker_validator.go index 9ab1c04468e..6cb0ab23623 100644 --- a/vendor/k8s.io/system-validators/validators/docker_validator.go +++ b/vendor/k8s.io/system-validators/validators/docker_validator.go @@ -49,7 +49,7 @@ func (d *DockerValidator) Name() string { const ( dockerConfigPrefix = "DOCKER_" - latestValidatedDockerVersion = "19.03" + latestValidatedDockerVersion = "20.10" ) // Validate is part of the system.Validator interface. diff --git a/vendor/k8s.io/system-validators/validators/types_unix.go b/vendor/k8s.io/system-validators/validators/types_unix.go index bd52f5c3f88..a315bb6cc96 100644 --- a/vendor/k8s.io/system-validators/validators/types_unix.go +++ b/vendor/k8s.io/system-validators/validators/types_unix.go @@ -70,7 +70,7 @@ var DefaultSysSpec = SysSpec{ CgroupsV2Optional: []string{"hugetlb"}, RuntimeSpec: RuntimeSpec{ DockerSpec: &DockerSpec{ - Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`}, + Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`, `20\.10\..*`}, GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"}, }, }, diff --git a/vendor/k8s.io/system-validators/validators/types_windows.go b/vendor/k8s.io/system-validators/validators/types_windows.go index e09100aec2f..afabfea1717 100644 --- a/vendor/k8s.io/system-validators/validators/types_windows.go +++ b/vendor/k8s.io/system-validators/validators/types_windows.go @@ -34,7 +34,7 @@ var DefaultSysSpec = SysSpec{ }, RuntimeSpec: RuntimeSpec{ DockerSpec: &DockerSpec{ - Version: []string{`18\.0[6,9]\..*`}, + Version: []string{`18\.0[6,9]\..*`, `19\.03\..*`}, GraphDriver: []string{"windowsfilter"}, }, }, diff --git a/vendor/modules.txt b/vendor/modules.txt index 69acd338682..4f94344ddb6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2553,9 +2553,9 @@ k8s.io/sample-apiserver/pkg/registry/wardle/fischer k8s.io/sample-apiserver/pkg/registry/wardle/flunder # 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 v1.3.0 => k8s.io/system-validators v1.3.0 +# k8s.io/system-validators v1.4.0 => k8s.io/system-validators v1.4.0 ## explicit -# k8s.io/system-validators => k8s.io/system-validators v1.3.0 +# k8s.io/system-validators => k8s.io/system-validators v1.4.0 k8s.io/system-validators/validators # k8s.io/utils v0.0.0-20201110183641-67b214c5f920 => k8s.io/utils v0.0.0-20201110183641-67b214c5f920 ## explicit