diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-07-16 09:10:22 +0000 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-16 05:28:33 -0400 |
| commit | b655311e3a22fd568c5d5ab4ba68a754347139a6 (patch) | |
| tree | e915962f01b1c31e5b9cbdd83c51fe3632932268 /vendor | |
| parent | 9efeb1cf290509caa4b0e3c206fe72d194d76a1e (diff) | |
| download | podman-b655311e3a22fd568c5d5ab4ba68a754347139a6.tar.gz podman-b655311e3a22fd568c5d5ab4ba68a754347139a6.tar.bz2 podman-b655311e3a22fd568c5d5ab4ba68a754347139a6.zip | |
Bump k8s.io/apimachinery from 0.18.5 to 0.18.6
Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.18.5 to 0.18.6.
- [Release notes](https://github.com/kubernetes/apimachinery/releases)
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.18.5...v0.18.6)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go | 3 | ||||
| -rw-r--r-- | vendor/k8s.io/apimachinery/pkg/util/net/http.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go index bf125b62a..e7aaead8c 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go @@ -873,6 +873,9 @@ const ( // FieldManagerConflict is used to report when another client claims to manage this field, // It should only be returned for a request using server-side apply. CauseTypeFieldManagerConflict CauseType = "FieldManagerConflict" + // CauseTypeResourceVersionTooLarge is used to report that the requested resource version + // is newer than the data observed by the API server, so the request cannot be served. + CauseTypeResourceVersionTooLarge CauseType = "ResourceVersionTooLarge" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go index 7449cbb0a..7b64e6815 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/net/http.go +++ b/vendor/k8s.io/apimachinery/pkg/util/net/http.go @@ -446,7 +446,7 @@ redirectLoop: // Only follow redirects to the same host. Otherwise, propagate the redirect response back. if requireSameHostRedirects && location.Hostname() != originalLocation.Hostname() { - break redirectLoop + return nil, nil, fmt.Errorf("hostname mismatch: expected %s, found %s", originalLocation.Hostname(), location.Hostname()) } // Reset the connection. diff --git a/vendor/modules.txt b/vendor/modules.txt index 7122f5fb8..ca0483ba6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -695,7 +695,7 @@ gopkg.in/yaml.v3 # k8s.io/api v0.18.5 k8s.io/api/apps/v1 k8s.io/api/core/v1 -# k8s.io/apimachinery v0.18.5 +# k8s.io/apimachinery v0.18.6 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/apis/meta/v1 |