internal/olm: make CLI output text more consistent; check resource errors #1902
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/M
estroz
force-pushed
the
olm-unify-cli-output
branch
from
8faa84a to
66fd308
Compare
|
/test e2e-aws-helm |
|
/test e2e-aws-subcommand |
1 similar comment
|
/test e2e-aws-subcommand |
joelanford
reviewed
Sep 10, 2019
camilamacedo86
requested changes
Oct 13, 2019
joelanford
reviewed
Oct 25, 2019
openshift-ci-robot
added
size/L
estroz
force-pushed
the
olm-unify-cli-output
branch
from
9485462 to
527a85e
Compare
|
@joelanford @camilamacedo86 seems to be working now with @joelanford's suggested changes. PTAL. |
camilamacedo86
approved these changes
Nov 8, 2019
estroz
force-pushed
the
olm-unify-cli-output
branch
from
527a85e to
e514942
Compare
camilamacedo86
added
approved
|
New changes are detected. LGTM label has been removed. |
joelanford
reviewed
Dec 4, 2019
internal/olm/client/status.go
Outdated
Comment on lines
121
to
130
| vb, err := v.MarshalJSON() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| // Use unversioned CustomResourceDefinition to avoid implementing cast | ||
| // for all versions. | ||
| obj, _, err := dec.Decode(vb, nil, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } |
There was a problem hiding this comment.
Is it possible to use something like this:
operator-sdk/pkg/helm/internal/types/types.go
Lines 138 to 141 in 3c8e5e7
estroz
commented
Dec 4, 2019
internal/olm/client.go
Outdated
| return nil, errors.New("detected existing OLM resources: OLM must be completely uninstalled before installation" + | ||
| fmt.Sprintf("\nResources:\n%s", status.String())) | ||
| } else if err != nil { | ||
| return nil, errors.New("detected errored OLM resources:" + |
There was a problem hiding this comment.
@joelanford wdyt about "detected errored OLM resources, see resource statuses for more details" as an alternative error message? I'm hesitant to wrap err here since it contains error information for only one resource.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change: make CLI output text consistent across
internal/olm, and return certain resource errors inStatus.HasInstalledResources().Motivation for the change: CLI output is easier to read. Output when running
olm installon a cluster that already has an OLM deployment now prints existing resource status.Resource.Erroris now also checked inStatus.HasInstalledResources()so any errors that indicate the resource might exist (is not a not-found error) are returned.