mirror of https://github.com/kubernetes/kops.git
Update k8s dependencies to v1.20.0
This commit is contained in:
Ciprian Hacman
parent
bee16c052d
commit
4bc97f1494
54
go.mod
54
go.mod
|
|
@ -2,49 +2,49 @@ module k8s.io/kops
|
|||
|
||||
go 1.14
|
||||
|
||||
// Version kubernetes-1.20.0-beta.2 => tag v0.20.0-beta.2
|
||||
// Version kubernetes-1.20.0-beta.2 => tag v0.20.0
|
||||
|
||||
replace k8s.io/api => k8s.io/api v0.20.0-beta.2
|
||||
replace k8s.io/api => k8s.io/api v0.20.0
|
||||
|
||||
replace k8s.io/apimachinery => k8s.io/apimachinery v0.20.0-beta.2
|
||||
replace k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
|
||||
|
||||
replace k8s.io/client-go => k8s.io/client-go v0.20.0-beta.2
|
||||
replace k8s.io/client-go => k8s.io/client-go v0.20.0
|
||||
|
||||
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0-beta.2
|
||||
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0
|
||||
|
||||
replace k8s.io/kubectl => k8s.io/kubectl v0.20.0-beta.2
|
||||
replace k8s.io/kubectl => k8s.io/kubectl v0.20.0
|
||||
|
||||
replace k8s.io/apiserver => k8s.io/apiserver v0.20.0-beta.2
|
||||
replace k8s.io/apiserver => k8s.io/apiserver v0.20.0
|
||||
|
||||
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0-beta.2
|
||||
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
|
||||
|
||||
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0-beta.2
|
||||
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0
|
||||
|
||||
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0-beta.2
|
||||
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0
|
||||
|
||||
replace k8s.io/cri-api => k8s.io/cri-api v0.20.0-beta.2
|
||||
replace k8s.io/cri-api => k8s.io/cri-api v0.20.0
|
||||
|
||||
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0-beta.2
|
||||
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0
|
||||
|
||||
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0-beta.2
|
||||
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0
|
||||
|
||||
replace k8s.io/component-base => k8s.io/component-base v0.20.0-beta.2
|
||||
replace k8s.io/component-base => k8s.io/component-base v0.20.0
|
||||
|
||||
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0-beta.2
|
||||
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
|
||||
|
||||
replace k8s.io/metrics => k8s.io/metrics v0.20.0-beta.2
|
||||
replace k8s.io/metrics => k8s.io/metrics v0.20.0
|
||||
|
||||
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0-beta.2
|
||||
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
|
||||
|
||||
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0-beta.2
|
||||
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0
|
||||
|
||||
replace k8s.io/kubelet => k8s.io/kubelet v0.20.0-beta.2
|
||||
replace k8s.io/kubelet => k8s.io/kubelet v0.20.0
|
||||
|
||||
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0-beta.2
|
||||
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
|
||||
|
||||
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0-beta.2
|
||||
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0
|
||||
|
||||
replace k8s.io/code-generator => k8s.io/code-generator v0.20.0-beta.2
|
||||
replace k8s.io/code-generator => k8s.io/code-generator v0.20.0
|
||||
|
||||
replace github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.11.0
|
||||
|
||||
|
|
@ -106,12 +106,12 @@ require (
|
|||
gopkg.in/yaml.v2 v2.3.0
|
||||
helm.sh/helm v2.17.0+incompatible
|
||||
honnef.co/go/tools v0.0.1-2020.1.4
|
||||
k8s.io/api v0.20.0-beta.2
|
||||
k8s.io/apimachinery v0.20.0-beta.2
|
||||
k8s.io/cli-runtime v0.20.0-beta.2
|
||||
k8s.io/client-go v0.20.0-beta.2
|
||||
k8s.io/api v0.20.0
|
||||
k8s.io/apimachinery v0.20.0
|
||||
k8s.io/cli-runtime v0.20.0
|
||||
k8s.io/client-go v0.20.0
|
||||
k8s.io/cloud-provider-openstack v1.19.2
|
||||
k8s.io/component-base v0.20.0-beta.2
|
||||
k8s.io/component-base v0.20.0
|
||||
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
|
||||
k8s.io/klog/v2 v2.4.0
|
||||
k8s.io/kubectl v0.0.0
|
||||
|
|
|
|||
67
go.sum
67
go.sum
|
|
@ -1224,31 +1224,30 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
|
|||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
k8s.io/api v0.20.0-beta.2 h1:ewQV7HgnW2oOahBQJsr0R1/ET1SyEWqirjm5QLHfzx0=
|
||||
k8s.io/api v0.20.0-beta.2/go.mod h1:GYLMpsvdRvB+u1feyZEqein68bklcyxaFnDYCvdHeJI=
|
||||
k8s.io/apiextensions-apiserver v0.20.0-beta.2 h1:wKupCDeTELXwplHwDnYkvqvNt9YZiKfWAYPglBYcplY=
|
||||
k8s.io/apiextensions-apiserver v0.20.0-beta.2/go.mod h1:QGBRlr7TrSTWydqbqiH46X33Pk5sAoUOJFToeZ2cL00=
|
||||
k8s.io/apimachinery v0.20.0-beta.2 h1:e5Sx20Jd/tSag85YelZzukkFgDtLz+QAM5rCupK/PvY=
|
||||
k8s.io/apimachinery v0.20.0-beta.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
|
||||
k8s.io/apiserver v0.20.0-beta.2/go.mod h1:JFMEdCPcGdd0UYAG891fiND5yqbcQW45DUUi4W3P+T8=
|
||||
k8s.io/cli-runtime v0.20.0-beta.2 h1:0pTS4UFuM0kCmMc18SfxaJ3x0m6sRZmBfUrAkwLNt4Q=
|
||||
k8s.io/cli-runtime v0.20.0-beta.2/go.mod h1:YO/ZWEae7Siu+FRUjGwajaiVSAxokYocVQ2yRKSbs/o=
|
||||
k8s.io/client-go v0.20.0-beta.2 h1:rA2QlaNJvaBpZnbmNjVKkv2C1cfTnOk0xR7AlQW6IGg=
|
||||
k8s.io/client-go v0.20.0-beta.2/go.mod h1:1CzSPtK+VaVV/53B6buT6fk/4F5KMQDlra+/ReQEQl0=
|
||||
k8s.io/cloud-provider v0.20.0-beta.2 h1:erBpIVSiROtMDbGJAagXBGLIBOA/RtkAdy+MhAEkXtY=
|
||||
k8s.io/cloud-provider v0.20.0-beta.2/go.mod h1:xu40/8K5o/wqZyuChUVqD5CoqVOVzKXE/jAqNFpV0uw=
|
||||
k8s.io/api v0.20.0 h1:WwrYoZNM1W1aQEbyl8HNG+oWGzLpZQBlcerS9BQw9yI=
|
||||
k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg=
|
||||
k8s.io/apiextensions-apiserver v0.20.0 h1:HmeP9mLET/HlIQ5gjP+1c20tgJrlshY5nUyIand3AVg=
|
||||
k8s.io/apiextensions-apiserver v0.20.0/go.mod h1:ZH+C33L2Bh1LY1+HphoRmN1IQVLTShVcTojivK3N9xg=
|
||||
k8s.io/apimachinery v0.20.0 h1:jjzbTJRXk0unNS71L7h3lxGDH/2HPxMPaQY+MjECKL8=
|
||||
k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
|
||||
k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8=
|
||||
k8s.io/cli-runtime v0.20.0 h1:UfTR9vGUWshJpwuekl7MqRmWumNs5tvqPj20qnmOns8=
|
||||
k8s.io/cli-runtime v0.20.0/go.mod h1:C5tewU1SC1t09D7pmkk83FT4lMAw+bvMDuRxA7f0t2s=
|
||||
k8s.io/client-go v0.20.0 h1:Xlax8PKbZsjX4gFvNtt4F5MoJ1V5prDvCuoq9B7iax0=
|
||||
k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY=
|
||||
k8s.io/cloud-provider v0.20.0 h1:CVPQ66iyfNgeGomUq2jE/TWrfzE77bdCpemhFS8955U=
|
||||
k8s.io/cloud-provider v0.20.0/go.mod h1:Lz/luSVD5BrHDDhtVdjFh0C2qQCRYdf0b9BHQ9L+bXc=
|
||||
k8s.io/cloud-provider-openstack v1.19.2 h1:u0bvV8gnro4kJkwpQZTO3sQWbrocQMggdXn95jQecjA=
|
||||
k8s.io/cloud-provider-openstack v1.19.2/go.mod h1:J/X/tgKwUDtsrfdJ4aL0iEQLi/8chdbs4rAiYznYwPQ=
|
||||
k8s.io/cluster-bootstrap v0.20.0-beta.2/go.mod h1:kYKZIdQhCt0sh13R7Bjm1JXDg9QVjez8TLlyhtDC8Ck=
|
||||
k8s.io/code-generator v0.20.0-beta.2 h1:9b5RwuTexjs/UH3BUMCMI4lTECshBUc/DenKnKc3eCs=
|
||||
k8s.io/code-generator v0.20.0-beta.2/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
|
||||
k8s.io/component-base v0.20.0-beta.2 h1:jg3eglA+HSDgimMoHoFvAiwHAGYxEy2D5HKhLPR4AjM=
|
||||
k8s.io/component-base v0.20.0-beta.2/go.mod h1:PS+w/i0JTsaQbtzk8EVPlj2WrY9E23MfWK/K4MNy7uc=
|
||||
k8s.io/component-helpers v0.20.0-beta.2/go.mod h1:0Olud755dVmvDY4nd3jv+dpujl7kA3aGKHKSto3mK7g=
|
||||
k8s.io/controller-manager v0.20.0-beta.2/go.mod h1:RRmfmjx++dNFs1mRFoJ1CLJ+hOHvuP9yGpAVKsTdCw0=
|
||||
k8s.io/cri-api v0.20.0-beta.2/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
|
||||
k8s.io/csi-translation-lib v0.20.0-beta.2 h1:EncGJjgVAqvrhrrOUhU3o+0pXhGkv2tyDlBou+kyaQ8=
|
||||
k8s.io/csi-translation-lib v0.20.0-beta.2/go.mod h1:ur930RUAEESro2ue4LZXyLh0R8XkKsfO6xczVB2J9DU=
|
||||
k8s.io/cluster-bootstrap v0.20.0/go.mod h1:6WZaNIBvcvL7MkPzSRKrZDIr4u+ePW2oIWoRsEFMjmE=
|
||||
k8s.io/code-generator v0.20.0/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
|
||||
k8s.io/component-base v0.20.0 h1:BXGL8iitIQD+0NgW49UsM7MraNUUGDU3FBmrfUAtmVQ=
|
||||
k8s.io/component-base v0.20.0/go.mod h1:wKPj+RHnAr8LW2EIBIK7AxOHPde4gme2lzXwVSoRXeA=
|
||||
k8s.io/component-helpers v0.20.0/go.mod h1:nx6NOtfSfGOxnSZsDJxpGbnsVuUA1UXpwDvZIrtigNk=
|
||||
k8s.io/controller-manager v0.20.0/go.mod h1:nD4qym/pmCz2v1tpqvlEBVlHW9CAZwedloM8GrJTLpg=
|
||||
k8s.io/cri-api v0.20.0/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
|
||||
k8s.io/csi-translation-lib v0.20.0 h1:I4wsA4/nW2low2auCUIq/ZCF58/FlCADr1OddBh0AOQ=
|
||||
k8s.io/csi-translation-lib v0.20.0/go.mod h1:M4CdD66GxEI6ev8aTtsA2NkK9kIF9K5VZQMcw/SsoLs=
|
||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
|
||||
|
|
@ -1261,21 +1260,21 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
|||
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
||||
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
|
||||
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
||||
k8s.io/kube-aggregator v0.20.0-beta.2/go.mod h1:DMszaXxUNYMP8fY0gXOic2pwYShIdZkCPFtT3fbQJOI=
|
||||
k8s.io/kube-controller-manager v0.20.0-beta.2/go.mod h1:dOQuCklgKhwc+S+47gQcgPFdtGJ7QMrnj94YfZGhuz0=
|
||||
k8s.io/kube-aggregator v0.20.0/go.mod h1:3Is/gzzWmhhG/rA3CpA1+eVye87lreBQDFGcAGT7gzo=
|
||||
k8s.io/kube-controller-manager v0.20.0/go.mod h1:Pmli7dnwIVpwKJVeab97yBt35QEFdw65oqT5ti0ikUs=
|
||||
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
|
||||
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/kube-proxy v0.20.0-beta.2/go.mod h1:Khb/VsdCy2uNvDx1gv39XVneZaBrpoY8BCSCeyI/FAs=
|
||||
k8s.io/kube-scheduler v0.20.0-beta.2/go.mod h1:YwWOWVsHtYFT8jjMeN6VKyUkD+wlm1fmIDqLHqDm3aw=
|
||||
k8s.io/kubectl v0.20.0-beta.2 h1:mLxbzqrSXP1UohwISjn7iVMYLZ6da8w/sceaR4BsHXo=
|
||||
k8s.io/kubectl v0.20.0-beta.2/go.mod h1:izc0F2IKzDRHC1g5gx91LMw99/YT80x2kOXdL2vVHKk=
|
||||
k8s.io/kubelet v0.20.0-beta.2/go.mod h1:wVZ6XLE1HO1ewFJzuRyacbPWfCGAfZD/UjY0iBv/MA0=
|
||||
k8s.io/kube-proxy v0.20.0/go.mod h1:R97oobM6zSh3ZqFMXi5DzCH/qJXNzua/UzcDmuQRexM=
|
||||
k8s.io/kube-scheduler v0.20.0/go.mod h1:cRTGsJU3TfQvbMJBmpoPgq9rBF5cQLpLKoOafKwdZnI=
|
||||
k8s.io/kubectl v0.20.0 h1:q6HH6jILYi2lkzFqBhs63M4bKLxYlM0HpFJ///MgARA=
|
||||
k8s.io/kubectl v0.20.0/go.mod h1:8x5GzQkgikz7M2eFGGuu6yOfrenwnw5g4RXOUgbjR1M=
|
||||
k8s.io/kubelet v0.20.0/go.mod h1:lMdjO1NA+JZXSYtxb48pQmNERmC+vVIXIYkJIugVhl0=
|
||||
k8s.io/kubernetes v1.19.0/go.mod h1:yhT1/ltQajQsha3tnYc9QPFYSumGM45nlZdjf7WqE1A=
|
||||
k8s.io/legacy-cloud-providers v0.20.0-beta.2 h1:BqZSIfvb11sKPtBepAezMOV8pauyU84xiuU1j6ph8u8=
|
||||
k8s.io/legacy-cloud-providers v0.20.0-beta.2/go.mod h1:jSj5T1UBoPmQ01un+V2eyAWS36h5Rzl5o88VxEAS2+0=
|
||||
k8s.io/metrics v0.20.0-beta.2/go.mod h1:uRja25Qx28gjiAgmMoW6QR8uFyLBh09uDiJb2YvUuRw=
|
||||
k8s.io/sample-apiserver v0.20.0-beta.2/go.mod h1:Wc1joHAptwu3b1hA6VtMeC4SUlo7j3rHI77vTuTHRV0=
|
||||
k8s.io/legacy-cloud-providers v0.20.0 h1:bF2WKO3ZWEjBvCv9RJxsxOAGrmQHWSgTiDBjK8uW2iw=
|
||||
k8s.io/legacy-cloud-providers v0.20.0/go.mod h1:1jEkaU7h9+b1EYdfWDBvhFAr+QpRfUjQfK+dGhxPGfA=
|
||||
k8s.io/metrics v0.20.0/go.mod h1:9yiRhfr8K8sjdj2EthQQE9WvpYDvsXIV3CjN4Ruq4Jw=
|
||||
k8s.io/sample-apiserver v0.20.0/go.mod h1:tScvbz/BcUG46IOsu2YLt4EjBP7XeUuMzMbQt2tQYWw=
|
||||
k8s.io/system-validators v1.1.2/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
|
||||
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ import (
|
|||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
|
|
@ -132,13 +133,61 @@ func SetTransportDefaults(t *http.Transport) *http.Transport {
|
|||
if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
|
||||
klog.Infof("HTTP2 has been explicitly disabled")
|
||||
} else if allowsHTTP2(t) {
|
||||
if err := http2.ConfigureTransport(t); err != nil {
|
||||
if err := configureHTTP2Transport(t); err != nil {
|
||||
klog.Warningf("Transport failed http2 configuration: %v", err)
|
||||
}
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
func readIdleTimeoutSeconds() int {
|
||||
ret := 30
|
||||
// User can set the readIdleTimeout to 0 to disable the HTTP/2
|
||||
// connection health check.
|
||||
if s := os.Getenv("HTTP2_READ_IDLE_TIMEOUT_SECONDS"); len(s) > 0 {
|
||||
i, err := strconv.Atoi(s)
|
||||
if err != nil {
|
||||
klog.Warningf("Illegal HTTP2_READ_IDLE_TIMEOUT_SECONDS(%q): %v."+
|
||||
" Default value %d is used", s, err, ret)
|
||||
return ret
|
||||
}
|
||||
ret = i
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
func pingTimeoutSeconds() int {
|
||||
ret := 15
|
||||
if s := os.Getenv("HTTP2_PING_TIMEOUT_SECONDS"); len(s) > 0 {
|
||||
i, err := strconv.Atoi(s)
|
||||
if err != nil {
|
||||
klog.Warningf("Illegal HTTP2_PING_TIMEOUT_SECONDS(%q): %v."+
|
||||
" Default value %d is used", s, err, ret)
|
||||
return ret
|
||||
}
|
||||
ret = i
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
func configureHTTP2Transport(t *http.Transport) error {
|
||||
t2, err := http2.ConfigureTransports(t)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// The following enables the HTTP/2 connection health check added in
|
||||
// https://github.com/golang/net/pull/55. The health check detects and
|
||||
// closes broken transport layer connections. Without the health check,
|
||||
// a broken connection can linger too long, e.g., a broken TCP
|
||||
// connection will be closed by the Linux kernel after 13 to 30 minutes
|
||||
// by default, which caused
|
||||
// https://github.com/kubernetes/client-go/issues/374 and
|
||||
// https://github.com/kubernetes/kubernetes/issues/87615.
|
||||
t2.ReadIdleTimeout = time.Duration(readIdleTimeoutSeconds()) * time.Second
|
||||
t2.PingTimeout = time.Duration(pingTimeoutSeconds()) * time.Second
|
||||
return nil
|
||||
}
|
||||
|
||||
func allowsHTTP2(t *http.Transport) bool {
|
||||
if t.TLSClientConfig == nil || len(t.TLSClientConfig.NextProtos) == 0 {
|
||||
// the transport expressed no NextProto preference, allow
|
||||
|
|
|
|||
|
|
@ -9,21 +9,21 @@ require (
|
|||
github.com/spf13/cobra v1.1.1
|
||||
github.com/spf13/pflag v1.0.5
|
||||
github.com/stretchr/testify v1.6.1
|
||||
k8s.io/api v0.20.0-beta.2
|
||||
k8s.io/apimachinery v0.20.0-beta.2
|
||||
k8s.io/apiserver v0.20.0-beta.2
|
||||
k8s.io/client-go v0.20.0-beta.2
|
||||
k8s.io/component-base v0.20.0-beta.2
|
||||
k8s.io/controller-manager v0.20.0-beta.2
|
||||
k8s.io/api v0.20.0
|
||||
k8s.io/apimachinery v0.20.0
|
||||
k8s.io/apiserver v0.20.0
|
||||
k8s.io/client-go v0.20.0
|
||||
k8s.io/component-base v0.20.0
|
||||
k8s.io/controller-manager v0.20.0
|
||||
k8s.io/klog/v2 v2.4.0
|
||||
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.20.0-beta.2
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.20.0-beta.2
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.20.0-beta.2
|
||||
k8s.io/client-go => k8s.io/client-go v0.20.0-beta.2
|
||||
k8s.io/component-base => k8s.io/component-base v0.20.0-beta.2
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.20.0-beta.2
|
||||
k8s.io/api => k8s.io/api v0.20.0
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.20.0
|
||||
k8s.io/client-go => k8s.io/client-go v0.20.0
|
||||
k8s.io/component-base => k8s.io/component-base v0.20.0
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.20.0
|
||||
)
|
||||
|
|
|
|||
|
|
@ -668,12 +668,12 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
k8s.io/api v0.20.0-beta.2/go.mod h1:GYLMpsvdRvB+u1feyZEqein68bklcyxaFnDYCvdHeJI=
|
||||
k8s.io/apimachinery v0.20.0-beta.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
|
||||
k8s.io/apiserver v0.20.0-beta.2/go.mod h1:JFMEdCPcGdd0UYAG891fiND5yqbcQW45DUUi4W3P+T8=
|
||||
k8s.io/client-go v0.20.0-beta.2/go.mod h1:1CzSPtK+VaVV/53B6buT6fk/4F5KMQDlra+/ReQEQl0=
|
||||
k8s.io/component-base v0.20.0-beta.2/go.mod h1:PS+w/i0JTsaQbtzk8EVPlj2WrY9E23MfWK/K4MNy7uc=
|
||||
k8s.io/controller-manager v0.20.0-beta.2/go.mod h1:RRmfmjx++dNFs1mRFoJ1CLJ+hOHvuP9yGpAVKsTdCw0=
|
||||
k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg=
|
||||
k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
|
||||
k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8=
|
||||
k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY=
|
||||
k8s.io/component-base v0.20.0/go.mod h1:wKPj+RHnAr8LW2EIBIK7AxOHPde4gme2lzXwVSoRXeA=
|
||||
k8s.io/controller-manager v0.20.0/go.mod h1:nD4qym/pmCz2v1tpqvlEBVlHW9CAZwedloM8GrJTLpg=
|
||||
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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
|
||||
|
|
|
|||
|
|
@ -875,7 +875,7 @@ honnef.co/go/tools/staticcheck
|
|||
honnef.co/go/tools/stylecheck
|
||||
honnef.co/go/tools/unused
|
||||
honnef.co/go/tools/version
|
||||
# k8s.io/api v0.20.0-beta.2 => k8s.io/api v0.20.0-beta.2
|
||||
# k8s.io/api v0.20.0 => k8s.io/api v0.20.0
|
||||
## explicit
|
||||
k8s.io/api/admission/v1
|
||||
k8s.io/api/admission/v1beta1
|
||||
|
|
@ -923,11 +923,11 @@ k8s.io/api/scheduling/v1beta1
|
|||
k8s.io/api/storage/v1
|
||||
k8s.io/api/storage/v1alpha1
|
||||
k8s.io/api/storage/v1beta1
|
||||
# k8s.io/apiextensions-apiserver v0.18.4 => k8s.io/apiextensions-apiserver v0.20.0-beta.2
|
||||
# k8s.io/apiextensions-apiserver v0.18.4 => k8s.io/apiextensions-apiserver v0.20.0
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
|
||||
# k8s.io/apimachinery v0.20.0-beta.2 => k8s.io/apimachinery v0.20.0-beta.2
|
||||
# k8s.io/apimachinery v0.20.0 => k8s.io/apimachinery v0.20.0
|
||||
## explicit
|
||||
k8s.io/apimachinery/pkg/api/equality
|
||||
k8s.io/apimachinery/pkg/api/errors
|
||||
|
|
@ -982,7 +982,7 @@ k8s.io/apimachinery/pkg/watch
|
|||
k8s.io/apimachinery/third_party/forked/golang/json
|
||||
k8s.io/apimachinery/third_party/forked/golang/netutil
|
||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||
# k8s.io/cli-runtime v0.20.0-beta.2 => k8s.io/cli-runtime v0.20.0-beta.2
|
||||
# k8s.io/cli-runtime v0.20.0 => k8s.io/cli-runtime v0.20.0
|
||||
## explicit
|
||||
k8s.io/cli-runtime/pkg/genericclioptions
|
||||
k8s.io/cli-runtime/pkg/kustomize
|
||||
|
|
@ -996,7 +996,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch
|
|||
k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator
|
||||
k8s.io/cli-runtime/pkg/printers
|
||||
k8s.io/cli-runtime/pkg/resource
|
||||
# k8s.io/client-go v0.20.0-beta.2 => k8s.io/client-go v0.20.0-beta.2
|
||||
# k8s.io/client-go v0.20.0 => k8s.io/client-go v0.20.0
|
||||
## explicit
|
||||
k8s.io/client-go/discovery
|
||||
k8s.io/client-go/discovery/cached/disk
|
||||
|
|
@ -1238,7 +1238,7 @@ k8s.io/client-go/util/jsonpath
|
|||
k8s.io/client-go/util/keyutil
|
||||
k8s.io/client-go/util/retry
|
||||
k8s.io/client-go/util/workqueue
|
||||
# k8s.io/cloud-provider v0.20.0-beta.2 => k8s.io/cloud-provider v0.20.0-beta.2
|
||||
# k8s.io/cloud-provider v0.20.0 => k8s.io/cloud-provider v0.20.0
|
||||
k8s.io/cloud-provider
|
||||
k8s.io/cloud-provider/node/helpers
|
||||
k8s.io/cloud-provider/service/helpers
|
||||
|
|
@ -1249,13 +1249,13 @@ k8s.io/cloud-provider/volume/helpers
|
|||
## explicit
|
||||
k8s.io/cloud-provider-openstack/pkg/util/errors
|
||||
k8s.io/cloud-provider-openstack/pkg/util/openstack
|
||||
# k8s.io/component-base v0.20.0-beta.2 => k8s.io/component-base v0.20.0-beta.2
|
||||
# k8s.io/component-base v0.20.0 => k8s.io/component-base v0.20.0
|
||||
## explicit
|
||||
k8s.io/component-base/metrics
|
||||
k8s.io/component-base/metrics/legacyregistry
|
||||
k8s.io/component-base/metrics/prometheus/restclient
|
||||
k8s.io/component-base/version
|
||||
# k8s.io/csi-translation-lib v0.20.0-beta.2 => k8s.io/csi-translation-lib v0.20.0-beta.2
|
||||
# k8s.io/csi-translation-lib v0.20.0 => k8s.io/csi-translation-lib v0.20.0
|
||||
k8s.io/csi-translation-lib/plugins
|
||||
# k8s.io/gengo v0.0.0-20201113003025-83324d819ded
|
||||
## explicit
|
||||
|
|
@ -1274,7 +1274,7 @@ k8s.io/klog/v2/klogr
|
|||
k8s.io/kube-openapi/pkg/common
|
||||
k8s.io/kube-openapi/pkg/util/proto
|
||||
k8s.io/kube-openapi/pkg/util/proto/validation
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.20.0-beta.2
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.20.0
|
||||
## explicit
|
||||
k8s.io/kubectl/pkg/cmd/util
|
||||
k8s.io/kubectl/pkg/cmd/util/editor
|
||||
|
|
@ -1290,7 +1290,7 @@ k8s.io/kubectl/pkg/util/openapi/validation
|
|||
k8s.io/kubectl/pkg/util/templates
|
||||
k8s.io/kubectl/pkg/util/term
|
||||
k8s.io/kubectl/pkg/validation
|
||||
# k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.20.0-beta.2
|
||||
# k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.20.0
|
||||
## explicit
|
||||
k8s.io/legacy-cloud-providers/aws
|
||||
k8s.io/legacy-cloud-providers/gce
|
||||
|
|
@ -1387,25 +1387,25 @@ sigs.k8s.io/structured-merge-diff/v4/value
|
|||
# sigs.k8s.io/yaml v1.2.0
|
||||
## explicit
|
||||
sigs.k8s.io/yaml
|
||||
# k8s.io/api => k8s.io/api v0.20.0-beta.2
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.20.0-beta.2
|
||||
# k8s.io/client-go => k8s.io/client-go v0.20.0-beta.2
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0-beta.2
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.20.0-beta.2
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.20.0-beta.2
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0-beta.2
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0-beta.2
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0-beta.2
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.20.0-beta.2
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0-beta.2
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0-beta.2
|
||||
# k8s.io/component-base => k8s.io/component-base v0.20.0-beta.2
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0-beta.2
|
||||
# k8s.io/metrics => k8s.io/metrics v0.20.0-beta.2
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0-beta.2
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0-beta.2
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.20.0-beta.2
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0-beta.2
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0-beta.2
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.20.0-beta.2
|
||||
# k8s.io/api => k8s.io/api v0.20.0
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
|
||||
# k8s.io/client-go => k8s.io/client-go v0.20.0
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.20.0
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.20.0
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.20.0
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0
|
||||
# k8s.io/component-base => k8s.io/component-base v0.20.0
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
|
||||
# k8s.io/metrics => k8s.io/metrics v0.20.0
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.20.0
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.20.0
|
||||
# github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.11.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue