search

openshift / machine-config-operator

Apache License 2.0
245 stars 408 forks source link

[release-4.15] OCPBUGS-27436: Fix mirrorSourcePolicy error prompt imagecontentsourcepolicies #4431

Closed QiWang19 closed 3 months ago

QiWang19 commented 3 months ago

- What I did cherry-pick of #4125 This PR replaces https://github.com/openshift/machine-config-operator/pull/4132 due to unit test failure with the auto cherrypick PR. - How to verify it

- Description for the changelog

openshift-ci-robot commented 3 months ago

@QiWang19: This pull request references Jira Issue OCPBUGS-27436, which is invalid:

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](https://github.com/openshift/machine-config-operator/pull/4431): > > >**- What I did** >cherry-pick of #4125 >**- How to verify it** > >**- Description for the changelog** > > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
QiWang19 commented 3 months ago

/jira refresh

openshift-ci-robot commented 3 months ago

@QiWang19: This pull request references Jira Issue OCPBUGS-27436, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note type set to "Release Note Not Required" * dependent bug [Jira Issue OCPBUGS-27190](https://issues.redhat.com//browse/OCPBUGS-27190) 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-27190](https://issues.redhat.com//browse/OCPBUGS-27190) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @lyman9966

In response to [this](https://github.com/openshift/machine-config-operator/pull/4431#issuecomment-2189150741): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
QiWang19 commented 3 months ago

/retest

QiWang19 commented 3 months ago

@lyman9966 #4431 failed the unit test, could you retag qe-approved?

openshift-ci[bot] commented 3 months ago

@QiWang19: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 53018a02f1a4281329a3bc62e34bd1235bc7924b link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-scos-e2e-gcp-ovn-upgrade 53018a02f1a4281329a3bc62e34bd1235bc7924b link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-gcp-op 53018a02f1a4281329a3bc62e34bd1235bc7924b link false /test okd-scos-e2e-gcp-op
ci/prow/okd-scos-e2e-vsphere-ovn 53018a02f1a4281329a3bc62e34bd1235bc7924b link false /test okd-scos-e2e-vsphere-ovn
ci/prow/e2e-vsphere-ovn-zones 53018a02f1a4281329a3bc62e34bd1235bc7924b link false /test e2e-vsphere-ovn-zones

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
lyman9966 commented 3 months ago

I think this pr is a replacement of https://github.com/openshift/machine-config-operator/pull/4132

lyman9966 commented 3 months ago

/label qe-approved

1 create an ImageContentSourcePolicy 2 create an ImageDigestMirrorSet with conflicting mirrorSourcePolicy for the same source "registry.example.com/example" The machine-config-controller log tips : could not Create/Update MachineConfig: could not update registries config with new changes: conflicting mirrorSourcePolicy is set for the same source "registry.example.com/example" in imagedigestmirrorsets, imagetagmirrorsets, or imagecontentsourcepolicies

QiWang19 commented 3 months ago

@lyman9966 Do you have a power tag cherry-pick-approved and backport-risk-assessed?

rphillips commented 3 months ago

/lgtm

rphillips commented 3 months ago

/label backport-risk-assessed

QiWang19 commented 3 months ago

@yuqi-zhang could you tag approved?

openshift-ci[bot] commented 3 months ago

[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: - ~~[OWNERS](https://github.com/openshift/machine-config-operator/blob/release-4.15/OWNERS)~~ [yuqi-zhang] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
sunilcio commented 3 months ago

/label cherry-pick-approved

openshift-ci-robot commented 3 months ago

/retest-required

Remaining retests: 0 against base HEAD 98cf6fbede4d0ba3746bcaa5c13211e2e88faa86 and 2 for PR HEAD 53018a02f1a4281329a3bc62e34bd1235bc7924b in total

openshift-ci-robot commented 3 months ago

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

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

In response to [this](https://github.com/openshift/machine-config-operator/pull/4431): > > >**- What I did** >cherry-pick of #4125 >This PR replaces https://github.com/openshift/machine-config-operator/pull/4132 due to unit test failure with the auto cherrypick PR. >**- How to verify it** > >**- Description for the changelog** > > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-bot commented 3 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.15.0-202407041041.p0.g42e0757.assembly.stream.el8 for distgit ose-machine-config-operator. All builds following this will include this PR.

openshift-merge-robot commented 3 months ago

Fix included in accepted release 4.15.0-0.nightly-2024-07-04-171958