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-29494: Fix disconnected metadata inspection #3860

Merged
merged 1 commit into from Apr 12, 2024

Conversation

jparrill
Copy link
Contributor

@jparrill jparrill commented Apr 10, 2024

Now the Hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

Which issue(s) this PR fixes:
Fixes #OCPBUGS-29494

Now the hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@openshift-bot openshift-bot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 10, 2024
@openshift-bot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-29494, which is invalid:

  • expected the bug to target the "4.16.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:

Now the Hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

Which issue(s) this PR fixes:
Fixes #OCPBUGS-29494

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

openshift-ci bot commented Apr 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill

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 Apr 10, 2024
Copy link

netlify bot commented Apr 10, 2024

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 0d4e3c3
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/6616efe326e2ab0008e71a96
😎 Deploy Preview https://deploy-preview-3860--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@jparrill
Copy link
Contributor Author

/jira refresh

@openshift-bot openshift-bot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 10, 2024
@openshift-bot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-29494, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @LiangquanLi930

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-29494, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @LiangquanLi930

In response to this:

Now the Hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

Which issue(s) this PR fixes:
Fixes #OCPBUGS-29494

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 openshift-eng/jira-lifecycle-plugin repository.

@jparrill
Copy link
Contributor Author

/test e2e-aws

1 similar comment
@bryan-cox
Copy link
Member

/test e2e-aws

Copy link
Contributor

openshift-ci bot commented Apr 11, 2024

@jparrill: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@bryan-cox
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@jparrill jparrill added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label Apr 11, 2024
@jparrill
Copy link
Contributor Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 3edd910 into openshift:main Apr 12, 2024
12 checks passed
@openshift-ci-robot
Copy link

@jparrill: Jira Issue OCPBUGS-29494: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-29494 has been moved to the MODIFIED state.

In response to this:

Now the Hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

Which issue(s) this PR fixes:
Fixes #OCPBUGS-29494

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 openshift-eng/jira-lifecycle-plugin repository.

@jparrill
Copy link
Contributor Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@jparrill: #3860 failed to apply on top of branch "release-4.15":

Applying: OCPBUGS-29494: Fix disconnected metadata inspection
Using index info to reconstruct a base tree...
M	support/util/imagemetadata.go
M	support/util/imagemetadata_test.go
Falling back to patching base and 3-way merge...
Auto-merging support/util/imagemetadata_test.go
CONFLICT (content): Merge conflict in support/util/imagemetadata_test.go
Auto-merging support/util/imagemetadata.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-29494: Fix disconnected metadata inspection
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

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.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-04-13-070448

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. area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

6 participants