-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OCPBUGS-16742: Skip upgrade graph check for templatized cluster version #628
Conversation
@jc-rh: This pull request references Jira Issue OCPBUGS-16742, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
return nil | ||
} | ||
// check for all the required variables needed to make http call and retrieve image | ||
if versionInfo.upstream == "" || versionInfo.channel == "" || versionInfo.version == "" { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we also make sure here that versionInfo.image == ""?
If we reach this line here it doesn't necessarily mean that versionInfo.image is empty, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's checked on line 122
_, err := r.extractOpenshiftImagePlatformFromPolicies(policies) | ||
versionInfo, err := extractOCPVersionInfoFromPolicies(policies) | ||
|
||
if err == nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the current construct, we're not updating the CGU status with the first error - we might actually be getting a couple of errors, but we're only saving the last one in the status. It might be better to move this if err == nill
in a function and return err
for each error case? Just an idea.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what you mean. If something happens in the extract function, we skip this and set status at the end.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see what you mean now. The branches in this if block are actually mutually exclusive. Let me update the last else block. The image check there is actually redundant. The query function already does that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, nevermind - yes, it looks good.
Co-authored-by: Irina Mihai <imihai@redhat.com>
Co-authored-by: Irina Mihai <imihai@redhat.com>
/lgtm |
/lgtm |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jc-rh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@jc-rh: Jira Issue OCPBUGS-16742: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-16742 has been moved to the MODIFIED state. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/cherrypick release-4.13 |
@jc-rh: new pull request created: #629 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
No description provided.