Check for forbidden error on ImageStreamImport client #6837
Conversation
| status, ok := err.(kclient.APIStatus) | ||
| if !ok { | ||
| return ErrImageStreamImportUnsupported | ||
| } | ||
| if status.Status().Details == nil || status.Status().Details.Kind == "" { | ||
| if status.Status().Code == http.StatusForbidden || status.Status().Details == nil || status.Status().Details.Kind == "" { |
There was a problem hiding this comment.
Put this into it's if block and add a comment
There was a problem hiding this comment.
There is an integration test or unit test that verifies this somewhere
csrwng
force-pushed
the
imagestreamimport-fallback
branch
from
6da9fbd
to
8da84a5
Compare
|
fixed and added test |
| // The ImageStreamImport resource exists in v1.1.1 of origin but is not yet | ||
| // enabled by policy. A create request will return a Forbidden(403) error. | ||
| // We want to return ErrImageStreamImportUnsupported to allow fallback behavior | ||
| // in clients. |
There was a problem hiding this comment.
Also, an admin may just want to forbid import just for normal use.
|
LGTM [merge] thanks |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4750/) (Image: devenv-rhel7_3251) |
|
Evaluated for origin merge up to 8da84a5 |
|
[Test]ing while waiting on the merge queue |
|
Evaluated for origin test up to 8da84a5 |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/469/) |
Merged by openshift-bot
|
I may end up moving this out of this method so that clients have to check it themselves - will come back to this once I sort out the outcome. We use "ErrImageStreamImportNotSupported" to indicate whether we support "scheduled" or not, so we'll probably need some story. |
The fallback for the ImageStreamImport searcher in new-app/new-build is not working with a server version v1.1.1 and a newer client. Because the resource exists but is not exposed through policy, the request will return a 403. Added a 403 check to return an ErrImageStreamImportUnsupported error so the fallback can occur.
Fixes #6836