Merge pull request #119871 from liggitt/automated-cherry-pick-of-#119835-upstream-release-1.26

Automated cherry pick of #119835: Avoid returning nil responseKind in v1beta1 aggregated

Kubernetes-commit: 81c519fc099227707ac2eb73df0fa34759e08c5d
This commit is contained in:
Kubernetes Publisher
2023-08-10 07:13:28 -07:00
parent 7b6e8d8480
commit 0d6350fa4e
2 changed files with 4 additions and 4 deletions

4
go.mod
View File

@@ -24,7 +24,7 @@ require (
golang.org/x/term v0.6.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.1
k8s.io/api v0.0.0-20230712211856-223fc117cbc1
k8s.io/api v0.0.0-20230810162501-191d7513c990
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
@@ -59,6 +59,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230712211856-223fc117cbc1
k8s.io/api => k8s.io/api v0.0.0-20230810162501-191d7513c990
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3
)

4
go.sum
View File

@@ -476,8 +476,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230712211856-223fc117cbc1 h1:CvzFCcbIXbKCryJKuZaJ3AEKvEJcnk5o6hPLY64DTZ4=
k8s.io/api v0.0.0-20230712211856-223fc117cbc1/go.mod h1:Q8EGFh0r6aLpTL7AhOHjtyGHqNgb1S4Tly2XwYg8XT0=
k8s.io/api v0.0.0-20230810162501-191d7513c990 h1:RZouv6no7Ei5UWcZQiur78g8oxk5tYszJ6D2PmrCEoE=
k8s.io/api v0.0.0-20230810162501-191d7513c990/go.mod h1:Seu8uHCjWVo8IJ4PctRHold4ZZvTV5tGi24E93z4YUM=
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3 h1:knrxsqbI6uPqvwifZYRBmPwJE75MqMa6ejj1JqoldqQ=
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=