diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-16 09:09:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 09:09:23 -0400 |
| commit | fbce0a9388406fa7f5862288628a125f3a87d7f6 (patch) | |
| tree | 6297d53e865bad867b8bee72fe7d272016f17444 /vendor | |
| parent | 11fe85702ccebcba5593fcc8ff00d5e717499f44 (diff) | |
| parent | b655311e3a22fd568c5d5ab4ba68a754347139a6 (diff) | |
| download | podman-fbce0a9388406fa7f5862288628a125f3a87d7f6.tar.gz podman-fbce0a9388406fa7f5862288628a125f3a87d7f6.tar.bz2 podman-fbce0a9388406fa7f5862288628a125f3a87d7f6.zip | |
Merge pull request #6999 from containers/dependabot/go_modules/k8s.io/apimachinery-0.18.6
Bump k8s.io/apimachinery from 0.18.5 to 0.18.6
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 fc51c071e..ae0ba5668 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 |