diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 054e540d..0bf0a51d 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -480,7 +480,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "ba18a62c2bc2" + "Rev": "ec059b16b345" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index b1699279..a6594cc4 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba google.golang.org/protobuf v1.25.0 k8s.io/api v0.0.0-20210518101556-95cee4894d89 - k8s.io/apimachinery v0.0.0-20210518100450-ba18a62c2bc2 + k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/structured-merge-diff/v4 v4.1.1 @@ -38,5 +38,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20210518101556-95cee4894d89 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100450-ba18a62c2bc2 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 ) diff --git a/go.sum b/go.sum index 313d2676..0bc63b08 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20210518101556-95cee4894d89 h1:uQC3v+9tBtiF1mXGGdM3vN7gDW7StAJCFO4sO0USjhE= k8s.io/api v0.0.0-20210518101556-95cee4894d89/go.mod h1:ZFbvp5WWMe1V9auNefRgVPZzDDSzTMLlulKIDnadhQU= -k8s.io/apimachinery v0.0.0-20210518100450-ba18a62c2bc2 h1:KvBnUwNEF2aGJHZbEJW5ck1Tq1R04dSsMPHOSQc2gYo= -k8s.io/apimachinery v0.0.0-20210518100450-ba18a62c2bc2/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= +k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 h1:oZsYo/CKdpQiJIYzlW07FuZK8UE43taXkz+pS9H0Phg= +k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= diff --git a/tools/watch/until.go b/tools/watch/until.go index b644fe7c..bf74837d 100644 --- a/tools/watch/until.go +++ b/tools/watch/until.go @@ -95,7 +95,7 @@ func UntilWithoutRetry(ctx context.Context, watcher watch.Interface, conditions // Until wraps the watcherClient's watch function with RetryWatcher making sure that watcher gets restarted in case of errors. // The initialResourceVersion will be given to watch method when first called. It shall not be "" or "0" -// given the underlying WATCH call issues (#74022). If you want the initial list ("", "0") done for you use ListWatchUntil instead. +// given the underlying WATCH call issues (#74022). // Remaining behaviour is identical to function UntilWithoutRetry. (See above.) // Until can deal with API timeouts and lost connections. // It guarantees you to see all events and in the order they happened.