Skip to content

OCPNODE-3006:Add clusterimgepolicy/imagepolicy to payload #2384

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

Merged

Conversation

QiWang19
Copy link
Member

@QiWang19 QiWang19 commented Jun 26, 2025

Added a commit to drop down the SigstoreImageVerification the gate from all sets


6b81288: Added commit to drop down the SigstoreImageVerification to DevPreview

  • Test the cluster can launch with and without specifying techpreview
launch 4.20.0-0.nightly-2025-07-15-083124,https://github.com/openshift/api/pull/2384,https://github.com/openshift/machine-config-operator/pull/5143,https://github.com/openshift/cluster-update-keys/pull/74 aws,techpreview
  • CRD, openshift policy is not available after TechPreviewNoUpgrade is enabled.

891ea2a: Test this PR with openshift/machine-config-operator#5143, openshift/cluster-update-keys#74:

  • Test the cluster can launch with and without specifying techpreview
launch 4.20.0-0.nightly-2025-07-01-051543,https://github.com/openshift/machine-config-operator/pull/5143,https://github.com/openshift/api/pull/2384,https://github.com/openshift/cluster-update-keys/pull/74 aws,techpreview

On the TechPreviewNoUpgrade cluster,

@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 Jun 26, 2025
Copy link
Contributor

openshift-ci bot commented Jun 26, 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

Copy link
Contributor

openshift-ci bot commented Jun 26, 2025

Hello @QiWang19! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@QiWang19
Copy link
Member Author

/test all

@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 26, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2025
@QiWang19 QiWang19 force-pushed the clusterimagepolicy-v1-payload branch from a794939 to d31e59b Compare June 28, 2025 01:57
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 28, 2025
@QiWang19
Copy link
Member Author

/retest-required

@QiWang19 QiWang19 force-pushed the clusterimagepolicy-v1-payload branch from d31e59b to 5c43881 Compare July 3, 2025 15:11
@QiWang19
Copy link
Member Author

QiWang19 commented Jul 3, 2025

/retest-required

@QiWang19
Copy link
Member Author

QiWang19 commented Jul 3, 2025

/test all

@QiWang19 QiWang19 changed the title Add clusterimgepolicy/imagepolicy to payload OCPNODE-3006:Add clusterimgepolicy/imagepolicy to payload Jul 8, 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 Jul 8, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 8, 2025

@QiWang19: This pull request references OCPNODE-3006 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.20.0" version, but no target version was set.

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

QiWang19 commented Jul 8, 2025

/test all

@QiWang19 QiWang19 marked this pull request as ready for review July 9, 2025 02:30
@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 Jul 9, 2025
@openshift-ci openshift-ci bot requested review from everettraven and JoelSpeed July 9, 2025 02:31
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2025

@QiWang19: This pull request references OCPNODE-3006 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.20.0" version, but no target version was set.

In response to this:

Test this PR with openshift/machine-config-operator#5143, openshift/cluster-update-keys#74:

  • Test the cluster can launch with and without specifying techpreview
launch 4.20.0-0.nightly-2025-07-01-051543,https://github.com/openshift/machine-config-operator/pull/5143,https://github.com/openshift/api/pull/2384,https://github.com/openshift/cluster-update-keys/pull/74 aws,techpreview

On the TechPreviewNoUpgrade cluster,

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 Jul 9, 2025

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2025

@QiWang19: This pull request references OCPNODE-3006 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.20.0" version, but no target version was set.

In response to this:

Test this PR with openshift/machine-config-operator#5143, openshift/cluster-update-keys#74:

  • Test the cluster can launch with and without specifying techpreview
launch 4.20.0-0.nightly-2025-07-01-051543,https://github.com/openshift/machine-config-operator/pull/5143,https://github.com/openshift/api/pull/2384,https://github.com/openshift/cluster-update-keys/pull/74 aws,techpreview

On the TechPreviewNoUpgrade cluster,

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

openshift-ci-robot commented Jul 9, 2025

@QiWang19: This pull request references OCPNODE-3006 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.20.0" version, but no target version was set.

In response to this:

Test this PR with openshift/machine-config-operator#5143, openshift/cluster-update-keys#74:

  • Test the cluster can launch with and without specifying techpreview
launch 4.20.0-0.nightly-2025-07-01-051543,https://github.com/openshift/machine-config-operator/pull/5143,https://github.com/openshift/api/pull/2384,https://github.com/openshift/cluster-update-keys/pull/74 aws,techpreview

On the TechPreviewNoUpgrade cluster,

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.

@JoelSpeed
Copy link
Contributor

Code changes look reasonable here, but I'd expect to see links to the prow runs where you tested these changes with the others?

Do you have a PR open to promote the feature gate as a WIP? Would be good to see how the feature gate testing is with the alpha types right now

We need to make sure that we are on track for the feature gate to be promoted before we merge this PR

@QiWang19
Copy link
Member Author

QiWang19 commented Jul 14, 2025

/testwith openshift/origin/main/e2e-aws-ovn-single-node-techpreview-serial https://github.com/openshift/api/pull/2384 https://github.com/openshift/cluster-update-keys/pull/74 https://github.com/openshift/origin/pull/29973 https://github.com/openshift/machine-config-operator/pull/5143

openshift/machine-config-operator#5143 (comment)

https://prow.ci.openshift.org/view/gs/test-platform-results/logs/multi-pr-openshift-machine-config-operator-5143-openshift-api-2384-openshift-cluster-update-keys-74-openshift-origin-29973-openshift-machine-config-operator-5143-e2e-aws-ovn-single-node-techpreview-serial/1943687569761898496

The tests [OCPFeatureGate:SigstoreImageVerification] pass from this run

@QiWang19
Copy link
Member Author

WIP PR that promotes the feature gate #2340

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 3333746 and 2 for PR HEAD 95dc771 in total

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@QiWang19 QiWang19 force-pushed the clusterimagepolicy-v1-payload branch from 95dc771 to 54e9300 Compare July 18, 2025 22:53
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@QiWang19
Copy link
Member Author

/test e2e-aws-ovn-techpreview

@QiWang19
Copy link
Member Author

/testwith openshift/api/master/e2e-aws-ovn-techpreview #2384 openshift/cluster-update-keys#74 openshift/machine-config-operator#5143

@QiWang19
Copy link
Member Author

QiWang19 commented Jul 21, 2025

/hold

We are going to remove the gate from all sets, get all of the API and then dependent PRs merged to move over to v1, and then re-enable the feature in the sets. This should avoid the need for a simul-merge across multiple repos

Required test e2e-aws-ovn-techpreview failed. I saw error below in the cluster.

From the discussion, get in this PR after openshift/cluster-update-keys#76

build 4.20.0-0.nightly-2025-07-15-083124, openshift/api#2384
[core@ip-10-0-163-242 ~]$ journalctl -b -f -u release-image.service -u bootkube.service
Jul 19 00:45:53 ip-10-0-163-242 bootkube.sh[4890]: [#14624] failed to create some manifests:
Jul 19 00:45:53 ip-10-0-163-242 bootkube.sh[4890]: "0000_90_openshift-cluster-image-policy.yaml": unable to get REST mapping for "0000_90_openshift-cluster-image-policy.yaml": no matches for kind "ClusterImagePolicy" in version "config.openshift.io/v1alpha1"

@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 Jul 21, 2025
QiWang19 added a commit to QiWang19/cluster-update-keys that referenced this pull request Jul 21, 2025
Drop openshift policy to DevPreviewNoUpgrade, so it will not install on TechPreviewNoUpgrade environment during the process moving ClusterImagePolicy to v1 from v1alpha1.
Will add openshift policy openshift#74 back after
openshift/api#2384
openshift/mco#5143

Signed-off-by: Qi Wang <[email protected]>
@QiWang19 QiWang19 force-pushed the clusterimagepolicy-v1-payload branch from 54e9300 to 14a7df2 Compare July 21, 2025 18:24
@QiWang19
Copy link
Member Author

/retest-required

@QiWang19
Copy link
Member Author

QiWang19 commented Jul 22, 2025

From the discussion, get in this PR after openshift/cluster-update-keys#76

/hold cancel

openshift/cluster-update-keys#76 merged

@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 Jul 22, 2025
@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 86ad96c and 2 for PR HEAD 14a7df2 in total

@QiWang19
Copy link
Member Author

/retest-required

@QiWang19 QiWang19 force-pushed the clusterimagepolicy-v1-payload branch from 14a7df2 to 60ac3d5 Compare July 23, 2025 21:08
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2025
@JoelSpeed
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jul 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, QiWang19

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

/retest-required

Remaining retests: 0 against base HEAD 9da003a and 2 for PR HEAD 60ac3d5 in total

Copy link
Contributor

openshift-ci bot commented Jul 24, 2025

@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 60ac3d5 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-gcp 60ac3d5 link false /test e2e-gcp

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

@openshift-merge-bot openshift-merge-bot bot merged commit 98ae8fb into openshift:master Jul 24, 2025
25 of 27 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.20.0-202507241646.p0.g98ae8fb.assembly.stream.el9.
All builds following this will include this PR.

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/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants