diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-07-24 14:09:12 -0400 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-08-11 12:15:12 +0200 |
| commit | a53b97beb3dfd3b95b205e35872344c5fadbb7c1 (patch) | |
| tree | e6b255cceca4ceffece094fcc90bd6d1b97e11ba /vendor | |
| parent | c5646acf4a06520f4fa65acdf8eebb4130c5e7d9 (diff) | |
| download | podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.tar.gz podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.tar.bz2 podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.zip | |
fix bug podman sign storage path
- fix the bud podman not using specified --directory as signature storage.
- use manifest and image referce to set repo@digest.
close #6994
close #6993
Backported-by: Valentin Rothberg <rothberg@redhat.com>
Signed-off-by: Qi Wang <qiwan@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 | 4 |
3 files changed, 6 insertions, 3 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 bf2a14d4c..4d1121553 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -689,10 +689,10 @@ gopkg.in/tomb.v1 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c gopkg.in/yaml.v3 -# k8s.io/api v0.18.4 +# k8s.io/api v0.18.6 k8s.io/api/apps/v1 k8s.io/api/core/v1 -# k8s.io/apimachinery v0.18.4 +# 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 |