Skip to content

Commit

Permalink
Merge pull request #105471 from seans3/automated-cherry-pick-of-#1053…
Browse files Browse the repository at this point in the history
…84-origin-release-1.22

Automated cherry pick of #105384: Fixes kubectl command headers which hangs on kubectl run

Kubernetes-commit: 3dc3d07834b0bc1de322edb7376ac1916ae94833
  • Loading branch information
k8s-publishing-bot committed Oct 8, 2021
1 parent 4eaadea commit 579232b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ require (
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210716001550-68328c152cca
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/cli-runtime v0.0.0-20210821164104-791f08ec174a
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b
k8s.io/client-go v0.0.0-20210927095136-36ef1697870d
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5
k8s.io/component-helpers v0.0.0-20210821161938-24f2ac1c1023
k8s.io/klog/v2 v2.9.0
Expand All @@ -48,10 +48,10 @@ require (

replace (
k8s.io/api => k8s.io/api v0.0.0-20210716001550-68328c152cca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210821164104-791f08ec174a
k8s.io/client-go => k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210821130359-c6452dc9cb0b
k8s.io/client-go => k8s.io/client-go v0.0.0-20210927095136-36ef1697870d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210906192742-22f764f53748
k8s.io/component-base => k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210821161938-24f2ac1c1023
k8s.io/metrics => k8s.io/metrics v0.0.0-20210821163913-98d2fd1dc73d
Expand Down
10 changes: 5 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,13 @@ 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=
k8s.io/api v0.0.0-20210716001550-68328c152cca h1:6AoteD5dwjeRYfsAH5Z8s52Xp2trgpH98OS7KwLRvBc=
k8s.io/api v0.0.0-20210716001550-68328c152cca/go.mod h1:FtqZiusVhnyM5jUPPFkDCU91OKo0sOpX9b9hotVGbIk=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 h1:Y40e5ho6n8KOvBCqdz/jm7ssKQyQLQdbZbC3lR9TaCU=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712 h1:zx3ZJS6iksKjoUoIs3BU1SRbRqoScwrUduK1IBBHtfc=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/cli-runtime v0.0.0-20210821164104-791f08ec174a h1:ibCi0jJf6vMC5o/ASGQfXQTuVJQjKqlWsDtNTEsdY9c=
k8s.io/cli-runtime v0.0.0-20210821164104-791f08ec174a/go.mod h1:y9smPZGONnArOjmt8uw85/JUPRj0V51/72IoLclESTw=
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b h1:17SqsVtOtUOshYV4NMXRibUOWKGQdoNlKujphTofAL8=
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b/go.mod h1:+NFu/lZU1mS8kUh1psD8heMubz2PQQUhnnXKflVMt0M=
k8s.io/code-generator v0.0.0-20210821130359-c6452dc9cb0b/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/client-go v0.0.0-20210927095136-36ef1697870d h1:jcTRLgnLdPyUAG3gtQqeAmL5n++0N7rd7zqNMKip22k=
k8s.io/client-go v0.0.0-20210927095136-36ef1697870d/go.mod h1:gf9tfu7k5npUOyIjLHovSbyMfKfPHVcucjrO6hUbVT0=
k8s.io/code-generator v0.0.0-20210906192742-22f764f53748/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5 h1:w3QcpRkwFx6cGQ1RTgv7TtlODnpFm4zKQHyqp55/uH4=
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5/go.mod h1:yiDVpud5YoKPVU8ZRlcoMjOtPa+KxqZPLy7zv82Xgew=
k8s.io/component-helpers v0.0.0-20210821161938-24f2ac1c1023 h1:orOyqkFJDoIPC2RZg/mx/Y6xu+2tRQicQQ9E0AfUKLY=
Expand Down

0 comments on commit 579232b

Please sign in to comment.