Merge pull request #111080 from zhoumingcheng/master-v3

Correct wrong syntax

Kubernetes-commit: 3b4d2a9b315be29f600c4eae704d62107fd5ff98
This commit is contained in:
Kubernetes Publisher 2022-07-14 14:37:08 -07:00
commit 163ee0b6d7
3 changed files with 7 additions and 7 deletions

4
go.mod
View File

@ -24,7 +24,7 @@ require (
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.0 google.golang.org/protobuf v1.28.0
k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0 k8s.io/api v0.0.0-20220714170823-fa32a3acacac
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a
k8s.io/klog/v2 v2.70.1 k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
@ -61,6 +61,6 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0 k8s.io/api => k8s.io/api v0.0.0-20220714170823-fa32a3acacac
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a
) )

4
go.sum
View File

@ -479,8 +479,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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20220714130747-08c75a7ce2b0 h1:1+Gb0Kje9jZR8hx0edzFB8oNBjzm5kc/UbOoISwoEU8= k8s.io/api v0.0.0-20220714170823-fa32a3acacac h1:LIfq5iBuTwIQYWgnehi7csEnj8JQMdkGELY6R4CJ6zU=
k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0/go.mod h1:xlTZXhM5RKsAvY03javUnK13iE/4mnhKPPE4oPaILYs= k8s.io/api v0.0.0-20220714170823-fa32a3acacac/go.mod h1:xlTZXhM5RKsAvY03javUnK13iE/4mnhKPPE4oPaILYs=
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a h1:XUzD47aXgkqvEXou0LNGFWqgLJ9U7TqmLAJ/0MOlPRw= k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a h1:XUzD47aXgkqvEXou0LNGFWqgLJ9U7TqmLAJ/0MOlPRw=
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a/go.mod h1:CNcND3K8ABL1dV2TGPzpp/lCzp9PRs+3Wo/Xn4dxzxA= k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a/go.mod h1:CNcND3K8ABL1dV2TGPzpp/lCzp9PRs+3Wo/Xn4dxzxA=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

View File

@ -2592,7 +2592,7 @@ func TestRequestWatchRetryWithRateLimiterBackoffAndMetrics(t *testing.T) {
testRetryWithRateLimiterBackoffAndMetrics(t, "Watch", func(ctx context.Context, r *Request) { testRetryWithRateLimiterBackoffAndMetrics(t, "Watch", func(ctx context.Context, r *Request) {
w, err := r.Watch(ctx) w, err := r.Watch(ctx)
if err == nil { if err == nil {
// in this test the the response body returned by the server is always empty, // in this test the response body returned by the server is always empty,
// this will cause StreamWatcher.receive() to: // this will cause StreamWatcher.receive() to:
// - return an io.EOF to indicate that the watch closed normally and // - return an io.EOF to indicate that the watch closed normally and
// - then close the io.Reader // - then close the io.Reader
@ -2620,7 +2620,7 @@ func TestRequestWatchWithRetryInvokeOrder(t *testing.T) {
testWithRetryInvokeOrder(t, "Watch", func(ctx context.Context, r *Request) { testWithRetryInvokeOrder(t, "Watch", func(ctx context.Context, r *Request) {
w, err := r.Watch(ctx) w, err := r.Watch(ctx)
if err == nil { if err == nil {
// in this test the the response body returned by the server is always empty, // in this test the response body returned by the server is always empty,
// this will cause StreamWatcher.receive() to: // this will cause StreamWatcher.receive() to:
// - return an io.EOF to indicate that the watch closed normally and // - return an io.EOF to indicate that the watch closed normally and
// - then close the io.Reader // - then close the io.Reader
@ -2635,7 +2635,7 @@ func TestRequestWatchWithWrapPreviousError(t *testing.T) {
testWithWrapPreviousError(t, func(ctx context.Context, r *Request) error { testWithWrapPreviousError(t, func(ctx context.Context, r *Request) error {
w, err := r.Watch(ctx) w, err := r.Watch(ctx)
if err == nil { if err == nil {
// in this test the the response body returned by the server is always empty, // in this test the response body returned by the server is always empty,
// this will cause StreamWatcher.receive() to: // this will cause StreamWatcher.receive() to:
// - return an io.EOF to indicate that the watch closed normally and // - return an io.EOF to indicate that the watch closed normally and
// - then close the io.Reader // - then close the io.Reader