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.

Sign up for GitHub

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

Jump to bottom

[release-4.13] OCPBUGS-23468: support icsp and idms objects #4027

Merged
merged 2 commits into from Dec 5, 2023
Merged

[release-4.13] OCPBUGS-23468: support icsp and idms objects #4027

merged 2 commits into from Dec 5, 2023

Conversation

QiWang19
Copy link
Member

- What I did
[release-4.13] support icsp and idms objects

backport #3898
remove the check that prevents ICSP and IDMS/ITMS from coexisting.
vendor runtime-utils to support both ICSP and IDMS objects writing to registries.conf
- How to verify it

- Description for the changelog

@QiWang19
[release-4.13] support icsp and idms objects
4a4c813 
backport openshift#3898
remove the check that prevents ICSP and IDMS/ITMS from coexisting.
vendor runtime-utils to support both ICSP and IDMS objects writing to registries.conf

Signed-off-by: Qi Wang <qiwan@redhat.com>
@QiWang19
update go.mod
ee6b791 
Signed-off-by: Qi Wang <qiwan@redhat.com>
@QiWang19 QiWang19 changed the title [release-4.13] support icsp and idms objects [release-4.13] OCPBUGS-23468support icsp and idms objects Nov 20, 2023
@QiWang19 QiWang19 changed the title [release-4.13] OCPBUGS-23468support icsp and idms objects [release-4.13] OCPBUGS-23468: OCPBUGS-23468support icsp and idms objects Nov 20, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 20, 2023
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-22275 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-22275 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

Requesting review from QA contact:
/cc @lyman9966

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

- What I did
[release-4.13] support icsp and idms objects

backport #3898
remove the check that prevents ICSP and IDMS/ITMS from coexisting.
vendor runtime-utils to support both ICSP and IDMS objects writing to registries.conf
- How to verify it

- Description for the changelog

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.

@QiWang19
Copy link
Member Author

/retest

@lyman9966
Copy link

test failed! When there is an ICSP exist in the cluster, then create IDMS failed, prompt: can't create ImageDigestMirrorSet when ImageContentSourcePolicy resources exist
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2023
@kwilczynski
Copy link
Member

/retitle [release-4.13] OCPBUGS-23468: support icsp and idms objects

@openshift-ci openshift-ci bot changed the title [release-4.13] OCPBUGS-23468: OCPBUGS-23468support icsp and idms objects [release-4.13] OCPBUGS-23468: support icsp and idms objects Nov 21, 2023
@QiWang19 QiWang19 marked this pull request as draft November 21, 2023 17:39
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 21, 2023
@QiWang19 QiWang19 mentioned this pull request Nov 30, 2023
Merged
@QiWang19
Copy link
Member Author

We can't verify this without getting openshift/kubernetes#1798. Let's merge them together and verify.

@QiWang19 QiWang19 marked this pull request as ready for review November 30, 2023 18:00
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2023
@QiWang19
Copy link
Member Author

QiWang19 commented Dec 1, 2023

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 1, 2023

@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 Dec 4, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 4, 2023
@rphillips
Copy link
Contributor

/label backport-risk-assessed
/lgtm

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 4, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2023
@QiWang19
Copy link
Member Author

QiWang19 commented Dec 4, 2023

@yuqi-zhang PTAL could you approve?

yuqi-zhang
yuqi-zhang approved these changes Dec 5, 2023
View reviewed changes
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

looks like a safe backport. Will require cherry-pick approval from QE still

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: QiWang19, rphillips, yuqi-zhang

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 Dec 5, 2023
@sunilcio
Copy link

sunilcio commented Dec 5, 2023

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 5, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit bf629e3 into openshift:release-4.13 Dec 5, 2023
15 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

- What I did
[release-4.13] support icsp and idms objects

backport #3898
remove the check that prevents ICSP and IDMS/ITMS from coexisting.
vendor runtime-utils to support both ICSP and IDMS objects writing to registries.conf
- How to verify it

- Description for the changelog

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-proxy-pull-test-container-v4.13.0-202312050750.p0.gbf629e3.assembly.stream for distgit openshift-proxy-pull-test.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.13.0-0.nightly-2023-12-05-084824

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@cgwalters cgwalters Awaiting requested review from cgwalters

@mtrmac mtrmac Awaiting requested review from mtrmac

@lyman9966 lyman9966 Awaiting requested review from lyman9966

@sinnykumari sinnykumari Awaiting requested review from sinnykumari

Assignees

@rbbratta rbbratta

@eurijon eurijon

@mburman5 mburman5

@reihl reihl

@jfrancoa jfrancoa

@anuragthehatter anuragthehatter

@sergiordlr sergiordlr

@rlobillo rlobillo

@rioliu-rh rioliu-rh

@mhanss mhanss

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet