Skip to content
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

Merged
merged 5 commits into from
Aug 4, 2023

Conversation

jc-rh
Copy link
Member

@jc-rh jc-rh commented Aug 3, 2023

No description provided.

@openshift-ci-robot
Copy link

@jc-rh: This pull request references Jira Issue OCPBUGS-16742, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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 == "" {
Copy link
Collaborator

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?

Copy link
Member Author

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 {
Copy link
Collaborator

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.

Copy link
Member Author

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.

Copy link
Member Author

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.

Copy link
Collaborator

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.

jc-rh and others added 3 commits August 4, 2023 09:42
Co-authored-by: Irina Mihai <imihai@redhat.com>
Co-authored-by: Irina Mihai <imihai@redhat.com>
@irinamihai
Copy link
Collaborator

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2023
@irinamihai
Copy link
Collaborator

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2023
@jc-rh
Copy link
Member Author

jc-rh commented Aug 4, 2023

/approve

@openshift-ci
Copy link

openshift-ci bot commented Aug 4, 2023

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2023
@openshift-merge-robot openshift-merge-robot merged commit 7f95455 into openshift-kni:main Aug 4, 2023
5 checks passed
@openshift-ci-robot
Copy link

@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.

@jc-rh
Copy link
Member Author

jc-rh commented Aug 4, 2023

/cherrypick release-4.13

@openshift-cherrypick-robot

@jc-rh: new pull request created: #629

In response to this:

/cherrypick release-4.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants