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

MCO-1437: MCO-1476: MCO-1477: MCO-1284: Adapt MCO to OCL v1 API #4756

Merged
merged 7 commits into from
Jan 27, 2025
Merged

MCO-1437: MCO-1476: MCO-1477: MCO-1284: Adapt MCO to OCL v1 API #4756

merged 7 commits into from
Jan 27, 2025

Conversation

djoshy
Copy link
Contributor

@djoshy djoshy commented Dec 13, 2024 •
edited
Loading

This PR does the following:

  • bumps client-go to capture OCL v1 API helpers
  • reconciles machine-os-builder and the operator to handle OCL v1 API
  • reconciles existing units/e2es to handle OCL v1 API
  • adds a global pull secret cloning mechanism since BaseImagePullSecret is optional in v1 API

How to test/verify:

  • TechPreview should be enabled
  • All existing units/e2es should pass
  • OCL workflows should be tested with v1 CRs(v1alpha1 CRDs will no longer work).

Note: This PR should be tested and merged along with openshift/api#2134

Clusterbot incantation:

launch openshift/machine-config-operator#4756,openshift/api#2134 techpreview

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 13, 2024
@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 Dec 13, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 13, 2024 •
edited by openshift-ci bot
Loading

@djoshy: This pull request references MCO-1437 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.19.0" version, but no target version was set.

In response to this:

[DNM] Testing current state of v1 API

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

openshift-ci bot commented Dec 13, 2024

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2024
djoshy
djoshy commented Dec 13, 2024
View reviewed changes
@djoshy
Copy link
Contributor Author

djoshy commented Dec 18, 2024

/test unit

@djoshy
Copy link
Contributor Author

djoshy commented Dec 18, 2024

/test unit
/test verify

@djoshy
Copy link
Contributor Author

djoshy commented Dec 18, 2024

/test unit
/test verify

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2024
@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-upgrade #4756 openshift/api#2134

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c4f6d350-d8e7-11ef-828d-853e5124944e-0

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@djoshy: This PR was included in a payload test run from #4756
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c4f6d350-d8e7-11ef-828d-853e5124944e-0

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/payload-job-with-prs periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-ovn-conformance openshift/api#2134

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-ovn-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/11fa2340-d8e9-11ef-9d46-0307a541224a-0

@djoshy djoshy force-pushed the reconcile-ocl-api branch from 7ff6f32 to 1de506c Compare January 24, 2025 20:54
@djoshy
Copy link
Contributor Author

djoshy commented Jan 24, 2025

Rebased to fix merge conflicts!
/honk

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

@djoshy:
goose image

In response to this:

Rebased to fix merge conflicts!
/honk

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.

@djoshy
Copy link
Contributor Author

djoshy commented Jan 24, 2025

/testwith openshift/machine-config-operator/master/e2e-gcp-op-ocl openshift/api#2134

@djoshy
Copy link
Contributor Author

djoshy commented Jan 25, 2025

/retest-required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 25, 2025

@djoshy: 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/e2e-azure-ovn-upgrade-out-of-change 1de506c link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/okd-scos-e2e-aws-ovn 1de506c link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-gcp-op-ocl 1de506c link false /test e2e-gcp-op-ocl
ci/prow/e2e-gcp-op-techpreview 1de506c link false /test e2e-gcp-op-techpreview

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.

@cheesesashimi cheesesashimi mentioned this pull request Jan 27, 2025
Open
yuqi-zhang
yuqi-zhang approved these changes Jan 27, 2025
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.

/lgtm

Given all the testing, I think we have a solid enough foundation to get this merged. Thanks everyone for all the hard work!

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

openshift-ci bot commented Jan 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, 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

@deads2k
Copy link
Contributor

deads2k commented Jan 27, 2025

merging openshift/api#2134 and #4756 as a pair for promotion. @yuqi-zhang and @JoelSpeed agreed they're ready.

@deads2k deads2k merged commit cfdda14 into openshift:master Jan 27, 2025
16 of 21 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.19.0-202501272117.p0.gcfdda14.assembly.stream.el9.
All builds following this will include this PR.

@djoshy djoshy mentioned this pull request Jan 28, 2025
Merged
@djoshy djoshy deleted the reconcile-ocl-api branch January 31, 2025 19:19
@yuqi-zhang yuqi-zhang mentioned this pull request Feb 4, 2025
Open
@djoshy djoshy mentioned this pull request Feb 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cheesesashimi cheesesashimi cheesesashimi left review comments

@umohnani8 umohnani8 umohnani8 left review comments

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

@RishabhSaini RishabhSaini Awaiting requested review from RishabhSaini

Assignees

@yuqi-zhang yuqi-zhang

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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@djoshy @openshift-ci-robot @yuqi-zhang @sergiordlr @deads2k @openshift-bot @cheesesashimi @umohnani8 @openshift-merge-robot