kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.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 f80d9a3b09 8e8e3a390c
commit 0fc4495b98
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -940,23 +940,23 @@
},
{
"ImportPath": "k8s.io/apiserver",
"Rev": "7dc5d986bb72"
"Rev": "4861eb79d72f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "09dbda0b387f"
"Rev": "2a923d5fc64c"
},
{
"ImportPath": "k8s.io/cloud-provider",
"Rev": "fa4f902360d6"
"Rev": "bdac1dbfb079"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "a099a26853cb"
"Rev": "f43a88d7e436"
},
{
"ImportPath": "k8s.io/controller-manager",
"Rev": "a6123ffd1f85"
"Rev": "f1bed723dd4c"
},
{
"ImportPath": "k8s.io/gengo",
@ -972,7 +972,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "67b214c5f920"
"Rev": "da695404a2bc"
},
{
"ImportPath": "rsc.io/binaryregexp",

14
go.mod
View File

@ -6,16 +6,16 @@ go 1.16
require (
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/cloud-provider v0.0.0-20210603160856-fa4f902360d6
k8s.io/controller-manager v0.0.0-20210603160750-a6123ffd1f85
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079
k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c
)
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/apiserver => k8s.io/apiserver v0.0.0-20210603155323-7dc5d986bb72
k8s.io/client-go => k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210603160856-fa4f902360d6
k8s.io/component-base => k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210603160750-a6123ffd1f85
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210604075629-4861eb79d72f
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079
k8s.io/component-base => k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c
)

20
go.sum
View File

@ -623,21 +623,21 @@ 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/apiserver v0.0.0-20210603155323-7dc5d986bb72/go.mod h1:979NHTb/uE53RR6oTvRhEYfM43qGH1f6GS73yQTO9yg=
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10=
k8s.io/cloud-provider v0.0.0-20210603160856-fa4f902360d6 h1:EWCkbOVSWe69rwNYUCuEOsIEOEk1QelVoKCyysu1Irs=
k8s.io/cloud-provider v0.0.0-20210603160856-fa4f902360d6/go.mod h1:iPv87ZAQ5yb9S38hmlnI18WwQliEkXEX3KiFTEWPC20=
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/controller-manager v0.0.0-20210603160750-a6123ffd1f85 h1:Qbs6XGfRLCAET8Nl26dQLtxK+GvvPjoBrrildoYKdH0=
k8s.io/controller-manager v0.0.0-20210603160750-a6123ffd1f85/go.mod h1:q++OmcmCiMq7Oknv0WU/jg1zq+ovL5HQpi9Wc0S3Frg=
k8s.io/apiserver v0.0.0-20210604075629-4861eb79d72f/go.mod h1:myg3nZYuiPNs00E2zezEo3ZeprAPcTUnjl5DJCO0Vhk=
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c/go.mod h1:b2OOrZSavDcpH/Enp5bEW6JNJnyKo00+8f1jS2gvl8s=
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079 h1:VCqRmBghq/WiYfyzm/W9ssSxHCC9xF272aYlnWvz3Hk=
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079/go.mod h1:lKpE0hQ6s8VqcWuWFDEnJjmscWkSlQn9e8xr3zpgIyc=
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/controller-manager v0.0.0-20210604081132-f1bed723dd4c h1:r+Xbxntz2KuCSV0zwwHMTnCgASUICBXIxQWgPFoI5Lo=
k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c/go.mod h1:gQ2XNc86esRV76AuSK3g719WQHr1IRq0/O74movAjm0=
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/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=