Skip to content

Commit 9112e19

Browse files
Merge pull request #115400 from pohly/automated-cherry-pick-of-#115354-origin-release-1.26
Automated cherry pick of #115354: dynamic resource allocation: avoid apiserver complaint about Kubernetes-commit: 41137e4de44ad12b86152359abc46414692906d1
2 parents 2e34348 + 7be38cd commit 9112e19

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

applyconfigurations/internal/internal.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
golang.org/x/term v0.3.0
2525
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
2626
google.golang.org/protobuf v1.28.1
27-
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
27+
k8s.io/api v0.0.0-20230210143907-2e857c1304dd
2828
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
2929
k8s.io/klog/v2 v2.80.1
3030
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
@@ -59,6 +59,6 @@ require (
5959
)
6060

6161
replace (
62-
k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
62+
k8s.io/api => k8s.io/api v0.0.0-20230210143907-2e857c1304dd
6363
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
6464
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
476476
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
477477
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
478478
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
479-
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ=
480-
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk=
479+
k8s.io/api v0.0.0-20230210143907-2e857c1304dd h1:Ax0FoVBkvM2NSSPl+nojstYihb6gu2/9pb2MDA6OWuQ=
480+
k8s.io/api v0.0.0-20230210143907-2e857c1304dd/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk=
481481
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis=
482482
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U=
483483
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=

0 commit comments

Comments
 (0)