Skip to content

Commit

Permalink
Merge pull request #117686 from ardaguclu/automated-cherry-pick-of-#1…
Browse files Browse the repository at this point in the history
…17495-upstream-release-1.26

Automated cherry pick of #117495: Use absolute path instead requestURI in openapiv3 discovery

Kubernetes-commit: 8a1ec6f79b3621043412d227b251e94fcd315493
  • Loading branch information
k8s-publishing-bot committed Apr 29, 2023
1 parent d72dec4 commit dbfbc03
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 @@ -24,7 +24,7 @@ require (
golang.org/x/term v0.5.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.1
k8s.io/api v0.0.0-20230311020447-0545f3a0485d
k8s.io/api v0.0.0-20230427154816-4c28c5a02241
k8s.io/apimachinery v0.0.0-20230215102121-53ecdf01b997
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
Expand Down Expand Up @@ -59,6 +59,6 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20230311020447-0545f3a0485d
k8s.io/api => k8s.io/api v0.0.0-20230427154816-4c28c5a02241
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230215102121-53ecdf01b997
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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-20230311020447-0545f3a0485d h1:28yD1s20Ow9n+uh8UNd8opfGUfJaEp54RG/YR0NaBbc=
k8s.io/api v0.0.0-20230311020447-0545f3a0485d/go.mod h1:hf9uiKf2s1FXvyGkg/nAkwMb35yQaTZrvdCtquvBpAE=
k8s.io/api v0.0.0-20230427154816-4c28c5a02241 h1:bksrstrKGloB0j7H4RgZ18tmgNfjM1M9c42/FWgJBc0=
k8s.io/api v0.0.0-20230427154816-4c28c5a02241/go.mod h1:hf9uiKf2s1FXvyGkg/nAkwMb35yQaTZrvdCtquvBpAE=
k8s.io/apimachinery v0.0.0-20230215102121-53ecdf01b997 h1:ZbxFKMGLvUrVMRxcfkGr9rVsPCERc+NhrdqpGY2XaCo=
k8s.io/apimachinery v0.0.0-20230215102121-53ecdf01b997/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
Expand Down

0 comments on commit dbfbc03

Please sign in to comment.