Skip to content

Commit

Permalink
Merge pull request #104988 from liggitt/automated-cherry-pick-of-#104…
Browse files Browse the repository at this point in the history
…969-upstream-release-1.22

Automated cherry pick of #104969: Propagate conversion errors

Kubernetes-commit: 39a3dc822461a2d2d9457af383ce7dfba23e726c
  • Loading branch information
k8s-publishing-bot committed Sep 27, 2021
1 parent c2005c2 commit 41e7589
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ require (
google.golang.org/grpc v1.38.0
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/apiserver v0.0.0-20210821162519-08961f21042f
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b
k8s.io/code-generator v0.0.0-20210821130359-c6452dc9cb0b
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/apiserver v0.0.0-20210918001622-a00f1af772ea
k8s.io/client-go v0.0.0-20210927095136-36ef1697870d
k8s.io/code-generator v0.0.0-20210906192742-22f764f53748
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
Expand All @@ -33,9 +33,9 @@ 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/apiserver => k8s.io/apiserver v0.0.0-20210821162519-08961f21042f
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/apimachinery => k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210918001622-a00f1af772ea
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
)
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -784,14 +784,14 @@ 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/apiserver v0.0.0-20210821162519-08961f21042f h1:oZsMpCiMMwWJP0pYcIug9RI2vXK3F5DdBviiDrM28Os=
k8s.io/apiserver v0.0.0-20210821162519-08961f21042f/go.mod h1:xeTyLpS/RLzQpBgau3PxsqNO8khxTvaOR7cUDS70G2s=
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 h1:9gMZ0EziDsOhoiafTfxRzi6TQZBTTJ1yIHnyExWrGCo=
k8s.io/code-generator v0.0.0-20210821130359-c6452dc9cb0b/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712 h1:zx3ZJS6iksKjoUoIs3BU1SRbRqoScwrUduK1IBBHtfc=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/apiserver v0.0.0-20210918001622-a00f1af772ea h1:aRtB1lup3nnV5Pm/HQiB+deogKgsJaXWmw0D326fkpw=
k8s.io/apiserver v0.0.0-20210918001622-a00f1af772ea/go.mod h1:xsvLfzZTd9AmR6hiBZWJntNSx/rFBM8cMdvIzXdeXlA=
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 h1:xiEdEV36FWB8gm99k4qefHWTVek/dAMwvHHWNsip2fg=
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/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
Expand Down

0 comments on commit 41e7589

Please sign in to comment.