Merge pull request #102059 from jsafrane/fix-consistentread

Retry reading /proc/mounts when unable to get a consistent read

Kubernetes-commit: 38783bfeb70f5d25262d195a779fbcfb72c73633
This commit is contained in:
Kubernetes Publisher 2021-06-03 21:59:37 -07:00
commit bbe195b64b
3 changed files with 13 additions and 13 deletions

6
Godeps/Godeps.json generated
View File

@ -488,11 +488,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "caa2ddeb897a"
"Rev": "2a923d5fc64c"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "9c11f9272960"
"Rev": "daefbeda97a9"
},
{
"ImportPath": "k8s.io/gengo",
@ -508,7 +508,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "67b214c5f920"
"Rev": "da695404a2bc"
},
{
"ImportPath": "rsc.io/binaryregexp",

8
go.mod
View File

@ -7,14 +7,14 @@ go 1.16
require (
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a
k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go => k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9
)

12
go.sum
View File

@ -442,10 +442,10 @@ k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb h1:bjPb0/AjLmHbYb+sYorOHImcVSqA+dM
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb/go.mod h1:G/aFk75uPvZtPzIzRb9OjwlDQCp9fVTsMnh1+PICcQc=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRKnexm0pPua15G2Aos6hFeg=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a h1:8aaHpDqqqU8qVysm/l4kcAP83SPFW30cZj6acYkn0RE=
k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10=
k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960 h1:lJLcAw8fjMImSz0pfJeJJF+4OJqOVL8eX2REe9QYhP0=
k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4=
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c h1:FBtlQ+V3SYiId4WWBAZob0vNQvi5PSW5jEQ4EIIXGxY=
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c/go.mod h1:b2OOrZSavDcpH/Enp5bEW6JNJnyKo00+8f1jS2gvl8s=
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9 h1:qM2ISnZQEWlHwongKghZCx2Wu/awLH7UFIMMPu0TFpI=
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@ -455,8 +455,8 @@ k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20210521133846-da695404a2bc h1:dx6VGe+PnOW/kD/2UV4aUSsRfJGd7+lcqgJ6Xg0HwUs=
k8s.io/utils v0.0.0-20210521133846-da695404a2bc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=