Skip to content

OCPNODE-3611: promote openshift ClusterImagePolicy to default featureset#85

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
QiWang19:default-openshift-cip
Nov 17, 2025
Merged

OCPNODE-3611: promote openshift ClusterImagePolicy to default featureset#85
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
QiWang19:default-openshift-cip

Conversation

@QiWang19
Copy link
Member

@QiWang19 QiWang19 commented Sep 29, 2025 •
edited
Loading

Revert:#83. This PR promotes openshift ClusterImagePolicy to the default featureset.

requires: openshift/origin#30318 to address the ci issue:

: [sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial]	1h14m13s
{  fail [github.com/openshift/origin/test/e2e/upgrade/upgrade.go:187]: during upgrade to registry.build11.ci.openshift.org/ci-op-cy2jcwgs/release@sha256:8cf00e640f46548e76028aa258ddddaaad987edb39e8399fc791b305321b4877: the "master" pool should be updated before the CVO reports available at the new version}

@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 Sep 29, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 29, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@QiWang19
Copy link
Member Author

QiWang19 commented Sep 29, 2025

/test all

@QiWang19 QiWang19 changed the title Remove openshift ClusterImagePolicy from TechPreviewNoUpgrade featureset promote openshift ClusterImagePolicy to default featureset Sep 29, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 29, 2025

@QiWang19, testwith: could not generate prow job. ERROR:

could not determine ci op config from metadata: got unexpected http 404 status code from configresolver: failed to get config: could not find any config for branch master on repo openshift/cluster-update-keys

@QiWang19
Copy link
Member Author

QiWang19 commented Sep 29, 2025

/testwith openshift/cluster-update-keys/main/e2e-aws-upgrade #85 openshift/origin#30318

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 29, 2025

@QiWang19, testwith: could not generate prow job. ERROR:

could not determine ci op config from metadata: got unexpected http 404 status code from configresolver: failed to get config: could not find any config for branch master on repo openshift/cluster-update-keys

@QiWang19
Copy link
Member Author

QiWang19 commented Sep 30, 2025

/testwith openshift/cluster-update-keys/main/e2e-aws-upgrade #85 openshift/origin#30318

@QiWang19
Copy link
Member Author

QiWang19 commented Sep 30, 2025

/testwith openshift/cluster-update-keys/main/e2e-aws-upgrade #85 openshift/origin#30318

https://prow.ci.openshift.org/view/gs/test-platform-results/logs/multi-pr-openshift-cluster-update-keys-85-openshift-cluster-update-keys-85-openshift-origin-30318-e2e-aws-upgrade/1973048767556882432

[sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial] test passed

@QiWang19 QiWang19 marked this pull request as ready for review September 30, 2025 17:47
@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 Sep 30, 2025
@openshift-ci openshift-ci bot requested review from sdodson and wking September 30, 2025 17:48
@QiWang19 QiWang19 mentioned this pull request Sep 30, 2025
Merged
@QiWang19 QiWang19 changed the title promote openshift ClusterImagePolicy to default featureset OCPNODE-3611: promote openshift ClusterImagePolicy to default featureset Sep 30, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 30, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 30, 2025 •
edited by openshift-ci bot
Loading

@QiWang19: This pull request references OCPNODE-3611 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

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

openshift-ci-robot commented Sep 30, 2025 •
edited by openshift-ci bot
Loading

@QiWang19: This pull request references OCPNODE-3611 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Revert:#83. This PR promotes openshift ClusterImagePolicy to the default featureset.

requires: openshift/origin#30318

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

openshift-ci-robot commented Sep 30, 2025 •
edited by openshift-ci bot
Loading

@QiWang19: This pull request references OCPNODE-3611 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Revert:#83. This PR promotes openshift ClusterImagePolicy to the default featureset.

requires: openshift/origin#30318 to address the ci issue:

: [sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial]	1h14m13s
{  fail [github.com/openshift/origin/test/e2e/upgrade/upgrade.go:187]: during upgrade to registry.build11.ci.openshift.org/ci-op-cy2jcwgs/release@sha256:8cf00e640f46548e76028aa258ddddaaad987edb39e8399fc791b305321b4877: the "master" pool should be updated before the CVO reports available at the new version}

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

QiWang19 commented Oct 3, 2025

/retest-required

@QiWang19
Copy link
Member Author

QiWang19 commented Oct 3, 2025

/test okd-scos-e2e-aws-ovn

This was referenced Nov 7, 2025
Closed
Merged
@QiWang19
Copy link
Member Author

QiWang19 commented Nov 10, 2025 •
edited
Loading

/verified by @QiWang19

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 10, 2025

@QiWang19: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified @QiWang19

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

QiWang19 commented Nov 10, 2025

@wking PTAL

@QiWang19
Copy link
Member Author

QiWang19 commented Nov 10, 2025

/verified by @QiWang19

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 10, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 10, 2025

@QiWang19: This PR has been marked as verified by @QiWang19.

Details

In response to this:

/verified by @QiWang19

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.

wking
wking approved these changes Nov 10, 2025
View reviewed changes
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2025
@jupierce
Copy link
Contributor

jupierce commented Nov 10, 2025

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jupierce, QiWang19, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Nov 10, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025

/retest-required

Remaining retests: 0 against base HEAD f4335a3 and 2 for PR HEAD 3daef4d in total

This was referenced Nov 11, 2025
Closed
Closed
@QiWang19
Copy link
Member Author

QiWang19 commented Nov 11, 2025

/testwith openshift/cluster-update-keys/main/e2e-aws-upgrade #85 openshift/origin#30477

@QiWang19 QiWang19 mentioned this pull request Nov 11, 2025
Merged
@QiWang19
Copy link
Member Author

QiWang19 commented Nov 12, 2025

/testwith openshift/cluster-update-keys/main/e2e-aws-upgrade #85 openshift/origin#30480

@QiWang19
Copy link
Member Author

QiWang19 commented Nov 13, 2025

/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 13, 2025
@QiWang19
Copy link
Member Author

QiWang19 commented Nov 13, 2025

/test e2e-aws-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 2025 •
edited
Loading

@QiWang19: The following test 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 3daef4d link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

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

@QiWang19
Copy link
Member Author

QiWang19 commented Nov 17, 2025

/test e2e-aws-upgrade

@QiWang19
Copy link
Member Author

QiWang19 commented Nov 17, 2025

/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 Nov 17, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 1f89a67 into openshift:main Nov 17, 2025
8 of 9 checks passed
smg247 added a commit to smg247/cluster-update-keys that referenced this pull request Nov 19, 2025
@smg247
Revert "Merge pull request openshift#85 from QiWang19/default-openshi…
7a5dcee 
…ft-cip"

This reverts commit 1f89a67, reversing
changes made to f4335a3.
@smg247 smg247 mentioned this pull request Nov 19, 2025
Merged
wking added a commit to wking/cluster-update-keys that referenced this pull request Nov 19, 2025
@wking
Revert "Revert "Merge pull request openshift#85 from QiWang19/default…
e489285 
…-openshift-cip""

This reverts commit 7a5dcee.

This one has taken us some time:

* 2025-08-27, 94f7582, openshift#82 was our first attempt at enabling the
  ClusterImagePolicy.
* ...but it tripped up the origin test suite, so it was reverted in
  2025-08-28, c40e7b9, openshift#83.
* Qi then hardened the test suite with openshift/origin@d3af51e4acb
  (not fail upgrade checks if all nodes are ready, 2025-09-29,
  openshift/origin#30318) and openshift/origin@2fd0d8e242 (Upgrade
  test add 2min grace period allow non-drain updates to complete,
  2025-11-12, openshift/origin#30480).
* With the tougher CI in place, we tried a second time with
  2025-11-17, 1f89a67, openshift#85.
* ...but still tripped up origin, with runs like [1] taking 2.25m
  (more than the 2m grace period):

    I1119 17:26:21.890667 1511 upgrade.go:629] Waiting on pools to be upgraded
    I1119 17:26:21.939178 1511 upgrade.go:792] Pool master is still reporting (Updated: false, Updating: true, Degraded: false)
    I1119 17:26:21.939259 1511 upgrade.go:666] Invariant violation detected: master pool requires update but nodes not ready. Waiting up to 2m0s for non-draining updates to complete
    I1119 17:26:31.984116 1511 upgrade.go:792] Pool master is still reporting (Updated: false, Updating: true, Degraded: false)
    ...
    I1119 17:28:21.981438 1511 upgrade.go:792] Pool master is still reporting (Updated: false, Updating: true, Degraded: false)
    I1119 17:28:21.981514 1511 upgrade.go:673] Invariant violation detected: the "master" pool should be updated before the CVO reports available at the new version

  and:

    $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade/1991158541779472384/artifacts/e2e-gcp-ovn-rt-upgrade/gather-extra/artifacts/inspect/cluster-scoped-resources/machineconfiguration.openshift.io/machineconfigpools/master.yaml | yaml2json | jq -r '.status.conditions[] | select(.type == "Updating") | .lastTransitionTime + " " + .status'
    2025-11-19T17:28:36Z False

  28:36 - 26:21 = 135s = 2.25m, which overshot the 2m grace period.
  The second attempt was reverted in 7a5dcee, openshift#87.

* Qi then hardened the test suite further with
  openshift/origin@c17e560263 (Update grace period for cluster upgrade
  to 10 minutes, 2025-11-19, #openshift/origin#30506).
* This commit is taking a third attempt at enabling the
  ClusterImagePolicy.

[1]: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade/1991158541779472384
@wking wking mentioned this pull request Nov 19, 2025
Merged
openshift-merge-bot bot added a commit that referenced this pull request Nov 20, 2025
@openshift-merge-bot
Merge pull request #87 from smg247/revert-85-1763582535572
5505c03 
TRT-2426: Revert #85 " \tOCPNODE-3611: promote openshift ClusterImagePolicy to default featureset"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sdodson sdodson Awaiting requested review from sdodson

1 more reviewer

@wking wking wking approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@wking wking

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@QiWang19 @openshift-ci-robot @jupierce @wking