Skip to content

Commit

Permalink
Merge pull request #119868 from liggitt/automated-cherry-pick-of-#119…
Browse files Browse the repository at this point in the history
…835-upstream-release-1.27

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

Kubernetes-commit: 00dfa0634be509c2dfdbdb1c1fc2f326c11323b6
  • Loading branch information
k8s-publishing-bot committed Aug 10, 2023
1 parent 31986ba commit 366ac8e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.20
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.1
k8s.io/apimachinery v0.0.0-20230612171306-38152d47d786
k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153
)

require (
Expand Down Expand Up @@ -37,4 +37,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612171306-38152d47d786
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/apimachinery v0.0.0-20230612171306-38152d47d786 h1:5apbbWoKi3ZjCSWm5UKfcNW2egne2ZbbG05tyUaKiKE=
k8s.io/apimachinery v0.0.0-20230612171306-38152d47d786/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153 h1:x2PSNcoDv7r2/kHjMWs1jAWYQjINJElAVG7B0mEOF2E=
k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
Expand Down

0 comments on commit 366ac8e

Please sign in to comment.