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-30279: vendor upgrade runtime-utils #419

Merged
merged 1 commit into from Mar 12, 2024

Conversation

QiWang19
Copy link
Member

@QiWang19 QiWang19 commented Mar 6, 2024

No description provided.

Signed-off-by: Qi Wang <qiwan@redhat.com>
@QiWang19 QiWang19 changed the title OCPBUGS-30279 : vendor upgrade runtime-utils OCPBUGS-30279: vendor upgrade runtime-utils Mar 6, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 Mar 6, 2024
@openshift-ci-robot
Copy link

@QiWang19: This pull request references Jira Issue OCPBUGS-30279, 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:

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-ci openshift-ci bot requested review from benluddy and mfojtik March 6, 2024 20:03
Copy link
Contributor

openshift-ci bot commented Mar 6, 2024

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

@QiWang19
Copy link
Member Author

QiWang19 commented Mar 7, 2024

@flavianmissi PTAL

@flavianmissi
Copy link
Member

Thanks for this @QiWang19! Do you think this is the problem @hongkailiu was facing in relation to OCPBUGS-30279? I haven't been able to confirm that myself yet.

@QiWang19
Copy link
Member Author

Do you think this is the problem @hongkailiu was facing in relation to OCPBUGS-30279?

@flavianmissi I haven't confirmed it. But the OCPBUGS-30279 was on a cluster with an existing ICSP, so the ICSP ITMS coexisting error should be the problem.
In Jira Issue OCPBUGS-30279, did you see openshift-apiserver return the error from the old version of runtime-utils? https://github.com/openshift/openshift-apiserver/blob/master/pkg/image/apiserver/registry/imagestreamimport/rest.go?plain=1#L316-L320

@flavianmissi
Copy link
Member

Aha, I wasn't aware the cluster used had ICSP. Unfortunately I did not check the error in the apiserver logs.
I'm going to give this the lgtm as it looks good. I'll get a 4.16 cluster with this code in it and see if the problem persists - will report my findings in the bug.

@flavianmissi
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
@QiWang19
Copy link
Member Author

/assign @sanchezl

@flavianmissi
Copy link
Member

I can confirm that it works now on GCP (launch openshift/openshift-apiserver#419,4.16.0-ec.3 gcp) - I followed the steps described in the bug comments and no longer get an error.
cc @hongkailiu

@flavianmissi
Copy link
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot 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 Mar 12, 2024
@openshift-ci-robot
Copy link

@flavianmissi: This pull request references Jira Issue OCPBUGS-30279, 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 New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @xiuwang

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-ci openshift-ci bot requested a review from xiuwang March 12, 2024 13:41
Copy link
Contributor

@sanchezl sanchezl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Contributor

openshift-ci bot commented Mar 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavianmissi, QiWang19, sanchezl

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 Mar 12, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit d3a4601 into openshift:master Mar 12, 2024
9 checks passed
@openshift-ci-robot
Copy link

@QiWang19: Jira Issue OCPBUGS-30279: All pull requests linked via external trackers have merged:

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

@QiWang19
Copy link
Member Author

@flavianmissi I think we can backport this to 4.15 and 4.14? OCP has backported to these version to support both ICSP, ITMS resources. Although the imagestream uses its own copy of registries config struct, we can backport for some kind of compatibility?

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-openshift-apiserver-container-v4.16.0-202403122214.p0.gd3a4601.assembly.stream.el9 for distgit ose-openshift-apiserver.
All builds following this will include this PR.

@flavianmissi
Copy link
Member

Backporting should be fine, but we need to do it manually so that we vendor commits from the correct branches - if we just use the cherry pick bot we'll endup vendoring commits from 4.16 on the 4.15 branch and so on (for example: v3.0.0-20240215131201-6b2f5d2f1f43 is a commit from the master branch of the docker-distribution repo and although the same commit is present in 4.15 and 4.14 branches it has different commit hashes).
Another thing is that release-4.14 branch of openshift/runtime-utils does not contain the commit allowing ICSP and IDMS objects to coexist (release-4.14 commits vs release-4.15 commits), so unless that commit is also backported to runtime-utils 4.14 branch we can only backport this bump down to 4.15 - your call.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-03-13-061822

@QiWang19
Copy link
Member Author

@flavianmissi FYI, this runtime-utils PR is up for 4.14 backport openshift/runtime-utils#21

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. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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