Merge pull request #107334 from fasaxc/automated-cherry-pick-of-#107311-upstream-release-1.23

Automated cherry pick of #107311: client-go: Clear the ResourceVersionMatch on paged list calls

Kubernetes-commit: fa546d8cc76fe7c07c538d55efd2e6dd4ec919a5
This commit is contained in:
Kubernetes Publisher
2022-01-06 01:18:29 -08:00
parent 8ae6aa22f3
commit 3074be12fe
2 changed files with 4 additions and 4 deletions

4
go.mod
View File

@@ -30,7 +30,7 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0-20211213212706-1cfd3d86aaa0
k8s.io/api v0.0.0-20211214212201-69f9c8763099
k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
@@ -40,6 +40,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211213212706-1cfd3d86aaa0
k8s.io/api => k8s.io/api v0.0.0-20211214212201-69f9c8763099
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb
)

4
go.sum
View File

@@ -610,8 +610,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-20211213212706-1cfd3d86aaa0 h1:PJVkxSygf000G2ZRUIJm9b7WVgLs9voUUYAYVELb65w=
k8s.io/api v0.0.0-20211213212706-1cfd3d86aaa0/go.mod h1:E0w2mg0s+tIsPsCEDvAWtelHXgsRwqcdOJZ0TdaaXNQ=
k8s.io/api v0.0.0-20211214212201-69f9c8763099 h1:DzmZIadhKmGZC6pm8cnmwbS5Hrp6eCNpRqe4whdBjro=
k8s.io/api v0.0.0-20211214212201-69f9c8763099/go.mod h1:E0w2mg0s+tIsPsCEDvAWtelHXgsRwqcdOJZ0TdaaXNQ=
k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb h1:0Ar7cEgnQUYRPlb5q6qIPkYPew3nilbL3v2ziJCfVZ4=
k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=