kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 7dc5d986bb 16fcc913fb
commit 4861eb79d7
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -940,11 +940,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "09dbda0b387f"
"Rev": "2a923d5fc64c"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "a099a26853cb"
"Rev": "f43a88d7e436"
},
{
"ImportPath": "k8s.io/gengo",
@ -960,7 +960,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "67b214c5f920"
"Rev": "da695404a2bc"
},
{
"ImportPath": "rsc.io/binaryregexp",

10
go.mod
View File

@ -40,11 +40,11 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19
sigs.k8s.io/structured-merge-diff/v4 v4.1.1
sigs.k8s.io/yaml v1.2.0
@ -53,6 +53,6 @@ require (
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-20210602034813-09dbda0b387f
k8s.io/component-base => k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/component-base => k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
)

12
go.sum
View File

@ -699,18 +699,18 @@ 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-20210602034813-09dbda0b387f h1:EMw9ViGOUCZwbQJ0I0rA+zZ3Eg4c30nbxV+HmrLH+No=
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10=
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb h1:FyISMbSyWuB8DF9cBsNbnHfqddL+Tb56VUHHQYWzsN0=
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb/go.mod h1:HdCRswmINRqx1a+Xg+d7WRwVC0dTz1KWletenZ/gqiU=
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/component-base v0.0.0-20210604075235-f43a88d7e436 h1:3e9RIUWBI4hlF+yA/bt3WYSw2whNFvEBL5bDjXQHHN0=
k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436/go.mod h1:q4xU8PZ5HGbR87UI7OPWBN1epKNk5tf8RSA7Zrhjrr0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
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=