Update to v1.18.20 (#3471)

* Update to v1.18.20

Signed-off-by: dereknola <derek.nola@suse.com>
release-1.18 v1.18.20+k3s1
Derek Nola 2021-06-17 08:26:13 -07:00 committed by GitHub
parent a260c3c61e
commit 57b73dc9ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 106 additions and 125 deletions

64
go.mod
View File

@ -34,31 +34,31 @@ replace (
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
github.com/rancher/k3s/pkg/data => ./pkg/data
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.18.19-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.18.19-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.19-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.18.19-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.18.19-k3s1
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.18.20-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.18.20-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.20-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.18.20-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.18.20-k3s1
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34
)
@ -119,14 +119,14 @@ require (
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
gopkg.in/yaml.v2 v2.2.8
gotest.tools/v3 v3.0.3 // indirect
k8s.io/api v0.18.19
k8s.io/apimachinery v0.18.19
k8s.io/apiserver v0.18.19
k8s.io/api v0.18.20
k8s.io/apimachinery v0.18.20
k8s.io/apiserver v0.18.20
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cloud-provider v0.18.19
k8s.io/component-base v0.18.19
k8s.io/cri-api v0.18.19
k8s.io/cloud-provider v0.18.20
k8s.io/component-base v0.18.20
k8s.io/cri-api v0.18.20
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.18.19
k8s.io/kubernetes v1.18.20
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
)

86
go.sum
View File

@ -457,49 +457,49 @@ github.com/k3s-io/cri v1.3.0-k3s.10 h1:K4pIza6Fnv9ucC2DigmTDHeW/v7nBT8cF2M3a1N6u
github.com/k3s-io/cri v1.3.0-k3s.10/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0=
github.com/k3s-io/helm-controller v0.8.3 h1:GWxavyMz7Bw2ClxH5okkeOL8o5U6IBK7uauc44SDCjU=
github.com/k3s-io/helm-controller v0.8.3/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
github.com/k3s-io/kubernetes v1.18.19-k3s1 h1:fvnFu5oeTnRqj33rY+rxnPCuBhVkoBD1L62draay5Jg=
github.com/k3s-io/kubernetes v1.18.19-k3s1/go.mod h1:2WmqQaRSlUlhX69or0YjnjAYxCkuI9O2Fz9hGog7heg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1 h1:iX8HqeGNedtgC4xE6KpoVsXni3JyZgh7R2cQ/sXIA7c=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1/go.mod h1:PC9bcnfNLq1T31Rtbqltzj+ITG7OgRj+MK5DF8iHUqk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1 h1:Gumgfcf5bItFSgRDOIQOlNOKauxlyDlToyBcPYiWw54=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1/go.mod h1:2qiGgN2MRNVYMXKCsoZ/ysR4QJvd9jY5MyZel3n64dc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1 h1:yRrl+Mb1GPOUi78c3cgF28IBbukUjGQJs4mMSfpmx/8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1/go.mod h1:7RMrL3mZjFkieIQzH5GlWcs7dg4HoIQPDQcTImrvQpY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1 h1:F1pTF1yU0ocq9QN9z9ZHgpMo216Lx9MBas/CJYlMd8E=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1/go.mod h1:hTbV9qTY3JfDIq09q697Di8Whude1qm/WZoS7eNgmWY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1 h1:9nt0ZTFMU0ZxWFlaC6ECncrwYzZ8NY+/P7heD+JTYok=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1/go.mod h1:rfS96fmWvrKQRuLrQPbMZ2xAgn+XBygQHdHeCRROsew=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1 h1:vny8/qwVAPF1FRiSWLfP2wedE0NwvAGCgbBDfD3SSZI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1/go.mod h1:RBeVxbBIHo2fPCKhKvw3C8xmTfDgDmz4TEIOJhOdYxE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1 h1:cCEgiJSxRzMIZQ8zF4MhIaTG8cFy/bbb1WuX8QYWe3Y=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1/go.mod h1:/K0GTm7zBgH+mh+V3UYvaNpv6hsY513kdZVavz78dt0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1 h1:WHlbTGZHjw/ObzWp2vhCMR3K8wHMbPYNYpEjehPjYkc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1/go.mod h1:GO6aJAE0G4vDExO1wjIYkSUNSHl/zxvqRDD9DeAzjoo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1 h1:7eHqbKcYayJhTyNM4QRgk+bjMgM7cAJPLPZA4EbIAJU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1/go.mod h1:khOUcwZP0BTqJU/LJOtE8Jl9bo5p9vULMKRKciv+AIg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1 h1:KWzur09dMCy6epd4Eagyk3PW/Fe4RgheW/mT0kZy0jY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1/go.mod h1:sk2sgP6I0EQaSU1ADwJe8oYtNzOHI0QlyPlr/3+vcDc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1 h1:6YxOzPAhurvrz0hahFJK11UlW1fwvxx+rcnDnZPebsQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1/go.mod h1:XnplkOLKxeKbT+y5vvjPWc+eONU9byDTVKI9hsqZTR4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1 h1:VRaa8gtG7MeEJAX5JwbPJzNO8ZqsVhS2fPUR7zp5eEk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1/go.mod h1:LQxrz5PyHX52C2QZCG0kSk+ImaVXBFpfVWD5K47VYXY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1 h1:0g5A+Cgj99uA1Sy/hNmoRn2vvX5YKLk8EF8JytvpY+s=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1/go.mod h1:0kouigesaO14L8x1Dpi2q3iEI43Zb+TjIMeNddpcvT8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1 h1:9zMMxy19G4qttWvkBDJGsU2Tx5qF3KnagKBMrF8FFUE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1/go.mod h1:PT4l/+Eiddqn5FnxLR+19Y6tbTsY0Jm2YyQyBMz+Uks=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1 h1:OuOoF0IPmrRQL/1ol9Uici05VIVGXwD8EG+BQi6diZI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1/go.mod h1:rQfCml0+V6Sm8UX+2Ol6aEp5Vx5Ia3jZ80DC4u7pjcc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1 h1:5hs8rUaM2ulXNH8hlRX1IQsyFsISftoBZkGXzIg21Uk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1/go.mod h1:x0AgqxB6jm40GkP+Qn3VQGqZq6SEs7AaG52z4H78Lp0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1 h1:JhpBDXPA42cNSy2oXW9tP5nws/Jy2/5m+ni7q8p3emE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1/go.mod h1:EVnvFvv90NpwDnScQlb4sI7rv68MOioOPBYAEjGEwXk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1 h1:3tQCaqxEAN9skDYX7Ji4knY6vynRZCP53Qip+kEAmTc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1/go.mod h1:vGzo6okdIPUlm1uKqvArNIb6lXo5aGAT4zXyrlCoMMA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1 h1:TXE1WfA4buijgoBwCF9OCkjnXXk2jeb1CW40rcvVBXw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1/go.mod h1:BBJvgp6V/akRY2bCFkJw+8xKx9o3sdabCbv1t0okkW4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1 h1:0E0aMlQS/J8iK9sHrGZUGlbfu6+x98kuIUOExwzJzy4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1/go.mod h1:E7cbaHkNadVcB+b9CqXqoRa++EwOikkSZTdGaJFHm58=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.19-k3s1/go.mod h1:lIYmFFDZSe2V4cvuXEVfgXo/9igVESR7VVV6i1kDOyw=
github.com/k3s-io/kubernetes v1.18.20-k3s1 h1:ovTc9gcTwQjkHO2O4YBvPXXM5BC2tnMJWIsHEpy+lXI=
github.com/k3s-io/kubernetes v1.18.20-k3s1/go.mod h1:2WmqQaRSlUlhX69or0YjnjAYxCkuI9O2Fz9hGog7heg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1 h1:CXeharqseNFyvFbczxucODgkrDvfvNU3uA3e69P2imA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1/go.mod h1:PC9bcnfNLq1T31Rtbqltzj+ITG7OgRj+MK5DF8iHUqk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1 h1:OSGuhSyK9j6rDOFVe/GqBOVQcDuQhI/+ACpscdiDwXw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1/go.mod h1:2qiGgN2MRNVYMXKCsoZ/ysR4QJvd9jY5MyZel3n64dc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1 h1:abs6DaXgQLREOBpZUUl8o5DPnXusIjy53YDaJxPIgdo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1/go.mod h1:7RMrL3mZjFkieIQzH5GlWcs7dg4HoIQPDQcTImrvQpY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1 h1:JfPWW1qxilxRQCIT5UxilQaPxLvBIm+mSwJGuqiJU1w=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1/go.mod h1:hTbV9qTY3JfDIq09q697Di8Whude1qm/WZoS7eNgmWY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1 h1:VD46klv1aoJCDIxBgMlhJ442WwiPM7xWsNney4XVIeA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1/go.mod h1:rfS96fmWvrKQRuLrQPbMZ2xAgn+XBygQHdHeCRROsew=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1 h1:Iz2x7Q8T9RHSBrMtJhjv95dhihGUaSC+UIRmU7iJ50I=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1/go.mod h1:RBeVxbBIHo2fPCKhKvw3C8xmTfDgDmz4TEIOJhOdYxE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1 h1:k0yQ7WJ7YDKhV8ID2cUOzzNqhfCv/7KIiu//zsUv4Ug=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1/go.mod h1:/K0GTm7zBgH+mh+V3UYvaNpv6hsY513kdZVavz78dt0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1 h1:rFEChQK4tsttpRAj1kiNDHSLGyuj93MPj3ygXbod/ug=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1/go.mod h1:GO6aJAE0G4vDExO1wjIYkSUNSHl/zxvqRDD9DeAzjoo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1 h1:m9qBsDyjFCt83EB5Xbn6XHv5igr2aDYUnMoSJ3InqtU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1/go.mod h1:khOUcwZP0BTqJU/LJOtE8Jl9bo5p9vULMKRKciv+AIg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1 h1:UwI3IANU2TbTluHD2/ZbTuYpc3Bs1P5GE8zkHvt7nnk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1/go.mod h1:sk2sgP6I0EQaSU1ADwJe8oYtNzOHI0QlyPlr/3+vcDc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1 h1:QU3eWSZ/HAouDWPEjJ75JMI/YstANz0Tt4x+jLzNcik=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1/go.mod h1:XnplkOLKxeKbT+y5vvjPWc+eONU9byDTVKI9hsqZTR4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1 h1:SKQ+zAFlkGvRr1ZSgtqxwJDB4lN8MumSM6HtZO2Qkuc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1/go.mod h1:LQxrz5PyHX52C2QZCG0kSk+ImaVXBFpfVWD5K47VYXY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1 h1:nn4QUIHkGguREoy+pHjv8W8fEacUL2uPyYYM5AKiDV0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1/go.mod h1:0kouigesaO14L8x1Dpi2q3iEI43Zb+TjIMeNddpcvT8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1 h1:YMO98x2GM2SSVKbTdBor8mNjZnM7F5I3qXG/CaoSQDU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1/go.mod h1:PT4l/+Eiddqn5FnxLR+19Y6tbTsY0Jm2YyQyBMz+Uks=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1 h1:QEnyF7kVIBwFOtRrTzoLc/cCdVS+LBAWqOfjJK1gxYo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1/go.mod h1:rQfCml0+V6Sm8UX+2Ol6aEp5Vx5Ia3jZ80DC4u7pjcc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1 h1:m1OCJnE7ZndXWmlvD1BQ0zcdHI0nhjcddrZx5U1RwWQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1/go.mod h1:x0AgqxB6jm40GkP+Qn3VQGqZq6SEs7AaG52z4H78Lp0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1 h1:ZKCCzi0GwOFxdxmjr/xAr4CpVFzp6DA9D7Jht7Xd7LA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1/go.mod h1:EVnvFvv90NpwDnScQlb4sI7rv68MOioOPBYAEjGEwXk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1 h1:Ki0nHoMCZqV+Kgr1gs98ebW6NNkLjcVgTifWrMGhlWc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1/go.mod h1:vGzo6okdIPUlm1uKqvArNIb6lXo5aGAT4zXyrlCoMMA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1 h1:JR4P7+d8tdV4KNNFxCKxaDXahqzl9PlWEfOqz95oenE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1/go.mod h1:BBJvgp6V/akRY2bCFkJw+8xKx9o3sdabCbv1t0okkW4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1 h1:WqcmaCs6KFcOu63fSI2vE60jE7KC6f2KkB66GQmzU8A=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1/go.mod h1:E7cbaHkNadVcB+b9CqXqoRa++EwOikkSZTdGaJFHm58=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.20-k3s1/go.mod h1:lIYmFFDZSe2V4cvuXEVfgXo/9igVESR7VVV6i1kDOyw=
github.com/karrick/godirwalk v1.7.5 h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=

View File

@ -78,8 +78,6 @@ type Connection interface {
// SetIdleTimeout sets the amount of time the connection may remain idle before
// it is automatically closed.
SetIdleTimeout(timeout time.Duration)
// RemoveStreams can be used to remove a set of streams from the Connection.
RemoveStreams(streams ...Stream)
}
// Stream represents a bidirectional communications channel that is part of an

View File

@ -31,7 +31,7 @@ import (
// streams.
type connection struct {
conn *spdystream.Connection
streams map[uint32]httpstream.Stream
streams []httpstream.Stream
streamLock sync.Mutex
newStreamHandler httpstream.NewStreamHandler
}
@ -64,11 +64,7 @@ func NewServerConnection(conn net.Conn, newStreamHandler httpstream.NewStreamHan
// will be invoked when the server receives a newly created stream from the
// client.
func newConnection(conn *spdystream.Connection, newStreamHandler httpstream.NewStreamHandler) httpstream.Connection {
c := &connection{
conn: conn,
newStreamHandler: newStreamHandler,
streams: make(map[uint32]httpstream.Stream),
}
c := &connection{conn: conn, newStreamHandler: newStreamHandler}
go conn.Serve(c.newSpdyStream)
return c
}
@ -85,7 +81,7 @@ func (c *connection) Close() error {
// calling Reset instead of Close ensures that all streams are fully torn down
s.Reset()
}
c.streams = make(map[uint32]httpstream.Stream, 0)
c.streams = make([]httpstream.Stream, 0)
c.streamLock.Unlock()
// now that all streams are fully torn down, it's safe to call close on the underlying connection,
@ -94,15 +90,6 @@ func (c *connection) Close() error {
return c.conn.Close()
}
// RemoveStreams can be used to removes a set of streams from the Connection.
func (c *connection) RemoveStreams(streams ...httpstream.Stream) {
c.streamLock.Lock()
for _, stream := range streams {
delete(c.streams, stream.Identifier())
}
c.streamLock.Unlock()
}
// CreateStream creates a new stream with the specified headers and registers
// it with the connection.
func (c *connection) CreateStream(headers http.Header) (httpstream.Stream, error) {
@ -122,7 +109,7 @@ func (c *connection) CreateStream(headers http.Header) (httpstream.Stream, error
// it owns.
func (c *connection) registerStream(s httpstream.Stream) {
c.streamLock.Lock()
c.streams[s.Identifier()] = s
c.streams = append(c.streams, s)
c.streamLock.Unlock()
}

View File

@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "18"
gitVersion = "v1.18.19-k3s1"
gitCommit = "fd4904f8d39be0e2bc4ed96b76fe71f22a74d3e3"
gitVersion = "v1.18.20-k3s1"
gitCommit = "74f8dd462f5ba32ee2ce332c0abb1a95d3546e83"
gitTreeState = "clean"
buildDate = "2021-05-14T11:55:20Z"
buildDate = "2021-06-16T18:31:51Z"
)

View File

@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "18"
gitVersion = "v1.18.19-k3s1"
gitCommit = "fd4904f8d39be0e2bc4ed96b76fe71f22a74d3e3"
gitVersion = "v1.18.20-k3s1"
gitCommit = "74f8dd462f5ba32ee2ce332c0abb1a95d3546e83"
gitTreeState = "clean"
buildDate = "2021-05-14T11:55:20Z"
buildDate = "2021-06-16T18:31:51Z"
)

View File

@ -163,10 +163,6 @@ func (h *httpStreamHandler) removeStreamPair(requestID string) {
h.streamPairsLock.Lock()
defer h.streamPairsLock.Unlock()
if h.conn != nil {
pair := h.streamPairs[requestID]
h.conn.RemoveStreams(pair.dataStream, pair.errorStream)
}
delete(h.streamPairs, requestID)
}

42
vendor/modules.txt vendored
View File

@ -1150,7 +1150,7 @@ gopkg.in/square/go-jose.v2/jwt
gopkg.in/warnings.v0
# gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2
# k8s.io/api v0.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1
# k8s.io/api v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
k8s.io/api/admissionregistration/v1
@ -1194,7 +1194,7 @@ k8s.io/api/settings/v1alpha1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1
# k8s.io/apiextensions-apiserver v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1
k8s.io/apiextensions-apiserver/pkg/apihelpers
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install
@ -1234,7 +1234,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi
k8s.io/apiextensions-apiserver/pkg/registry/customresource
k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor
k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition
# k8s.io/apimachinery v0.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1
# k8s.io/apimachinery v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
@ -1296,7 +1296,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/apiserver v0.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1
# k8s.io/apiserver v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1
k8s.io/apiserver/pkg/admission
k8s.io/apiserver/pkg/admission/configuration
k8s.io/apiserver/pkg/admission/initializer
@ -1426,7 +1426,7 @@ k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth
k8s.io/apiserver/plugin/pkg/authenticator/token/oidc
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
k8s.io/apiserver/plugin/pkg/authorizer/webhook
# k8s.io/cli-runtime v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1
# k8s.io/cli-runtime v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1
k8s.io/cli-runtime/pkg/genericclioptions
k8s.io/cli-runtime/pkg/kustomize
k8s.io/cli-runtime/pkg/kustomize/k8sdeps
@ -1439,7 +1439,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 v11.0.1-0.20190409021438-1a26190bd76a+incompatible => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1
# k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1
k8s.io/client-go/discovery
k8s.io/client-go/discovery/cached
k8s.io/client-go/discovery/cached/disk
@ -1673,7 +1673,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.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1
# k8s.io/cloud-provider v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1
k8s.io/cloud-provider
k8s.io/cloud-provider/api
k8s.io/cloud-provider/node/helpers
@ -1681,13 +1681,13 @@ k8s.io/cloud-provider/service/helpers
k8s.io/cloud-provider/volume
k8s.io/cloud-provider/volume/errors
k8s.io/cloud-provider/volume/helpers
# k8s.io/cluster-bootstrap v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1
# k8s.io/cluster-bootstrap v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1
k8s.io/cluster-bootstrap/token/api
k8s.io/cluster-bootstrap/token/jws
k8s.io/cluster-bootstrap/token/util
k8s.io/cluster-bootstrap/util/secrets
k8s.io/cluster-bootstrap/util/tokens
# k8s.io/code-generator v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1
# k8s.io/code-generator v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1
k8s.io/code-generator/cmd/client-gen/args
k8s.io/code-generator/cmd/client-gen/generators
k8s.io/code-generator/cmd/client-gen/generators/fake
@ -1702,7 +1702,7 @@ k8s.io/code-generator/cmd/lister-gen/args
k8s.io/code-generator/cmd/lister-gen/generators
k8s.io/code-generator/pkg/namer
k8s.io/code-generator/pkg/util
# k8s.io/component-base v0.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1
# k8s.io/component-base v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1
k8s.io/component-base/cli/flag
k8s.io/component-base/cli/globalflag
k8s.io/component-base/codec
@ -1720,10 +1720,10 @@ k8s.io/component-base/metrics/prometheus/workqueue
k8s.io/component-base/metrics/testutil
k8s.io/component-base/version
k8s.io/component-base/version/verflag
# k8s.io/cri-api v0.18.19 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1
# k8s.io/cri-api v0.18.20 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1
k8s.io/cri-api/pkg/apis
k8s.io/cri-api/pkg/apis/runtime/v1alpha2
# k8s.io/csi-translation-lib v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1
# k8s.io/csi-translation-lib v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1
k8s.io/csi-translation-lib
k8s.io/csi-translation-lib/plugins
# k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
@ -1738,7 +1738,7 @@ k8s.io/gengo/types
k8s.io/heapster/metrics/api/v1/types
# k8s.io/klog v1.0.0
k8s.io/klog
# k8s.io/kube-aggregator v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1
# k8s.io/kube-aggregator v0.18.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1
k8s.io/kube-aggregator/pkg/apis/apiregistration
k8s.io/kube-aggregator/pkg/apis/apiregistration/install
k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
@ -1766,7 +1766,7 @@ k8s.io/kube-aggregator/pkg/controllers/status
k8s.io/kube-aggregator/pkg/registry/apiservice
k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
k8s.io/kube-aggregator/pkg/registry/apiservice/rest
# k8s.io/kube-controller-manager v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1
# k8s.io/kube-controller-manager v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1
k8s.io/kube-controller-manager/config/v1alpha1
# k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
k8s.io/kube-openapi/pkg/aggregator
@ -1777,14 +1777,14 @@ k8s.io/kube-openapi/pkg/schemaconv
k8s.io/kube-openapi/pkg/util
k8s.io/kube-openapi/pkg/util/proto
k8s.io/kube-openapi/pkg/util/proto/validation
# k8s.io/kube-proxy v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1
# k8s.io/kube-proxy v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1
k8s.io/kube-proxy/config/v1alpha1
# k8s.io/kube-scheduler v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1
# k8s.io/kube-scheduler v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1
k8s.io/kube-scheduler/config/v1
k8s.io/kube-scheduler/config/v1alpha1
k8s.io/kube-scheduler/config/v1alpha2
k8s.io/kube-scheduler/extender/v1
# k8s.io/kubectl v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1
# k8s.io/kubectl v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1
k8s.io/kubectl/pkg/apps
k8s.io/kubectl/pkg/cmd
k8s.io/kubectl/pkg/cmd/annotate
@ -1859,11 +1859,11 @@ k8s.io/kubectl/pkg/util/storage
k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
k8s.io/kubectl/pkg/validation
# k8s.io/kubelet v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1
# k8s.io/kubelet v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1
k8s.io/kubelet/config/v1beta1
k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1
k8s.io/kubelet/pkg/apis/pluginregistration/v1
# k8s.io/kubernetes v1.18.19 => github.com/k3s-io/kubernetes v1.18.19-k3s1
# k8s.io/kubernetes v1.18.20 => github.com/k3s-io/kubernetes v1.18.20-k3s1
k8s.io/kubernetes/cmd/cloud-controller-manager/app
k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config
k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/scheme
@ -2606,7 +2606,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear
k8s.io/kubernetes/third_party/forked/gonum/graph/simple
k8s.io/kubernetes/third_party/forked/gonum/graph/traverse
k8s.io/kubernetes/third_party/forked/ipvs
# k8s.io/legacy-cloud-providers v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1
# k8s.io/legacy-cloud-providers v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1
k8s.io/legacy-cloud-providers/aws
k8s.io/legacy-cloud-providers/azure
k8s.io/legacy-cloud-providers/azure/auth
@ -2637,7 +2637,7 @@ k8s.io/legacy-cloud-providers/openstack
k8s.io/legacy-cloud-providers/vsphere
k8s.io/legacy-cloud-providers/vsphere/vclib
k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers
# k8s.io/metrics v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1
# k8s.io/metrics v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1
k8s.io/metrics/pkg/apis/custom_metrics
k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
k8s.io/metrics/pkg/apis/custom_metrics/v1beta2