Skip to content

MCO-1522: Adapt MCO to use PIS V1 API#4934

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
RishabhSaini:pisAPI
Mar 31, 2025
Merged

MCO-1522: Adapt MCO to use PIS V1 API#4934
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
RishabhSaini:pisAPI

Conversation

@RishabhSaini
Copy link
Copy Markdown
Contributor

@RishabhSaini RishabhSaini commented Mar 20, 2025

Bumps the API version
Bumps the client-go version
Modify the MCC, MCD and Tests to include the V1 PIS API

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 20, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 20, 2025

@RishabhSaini: This pull request references MCO-1522 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.

Details

In response to this:

- What I did

- 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 20, 2025

@RishabhSaini: This pull request references MCO-1522 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.

Details

In response to this:

Bumps the API version
Bumps the client-go version (currently points to PR branch, needs to point to master when merged)
Modify the MCC, MCD and Tests to include the V1 PIS 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.

@RishabhSaini
Copy link
Copy Markdown
Contributor Author

/test unit

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 21, 2025
@RishabhSaini
Copy link
Copy Markdown
Contributor Author

Realized that a lot of caches where a miss since strings.TrimSpace was needed

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 21, 2025
@RishabhSaini
Copy link
Copy Markdown
Contributor Author

/retest-required

@isabella-janssen
Copy link
Copy Markdown
Member

isabella-janssen commented Mar 27, 2025

Bumps the client-go version (currently points to PR branch, needs to point to master when merged)

Is comment out of date? It looks like openshift/client-go#314 merged and this appears to be pointing to the corresponding commit (f0faeb0f2f2e3b944101467a5eda96bc4fffe1e9)?

If so, lgtm but I'd defer final approval to others on the team.

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 28, 2025

@RishabhSaini: This pull request references MCO-1522 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.

Details

In response to this:

Bumps the API version
Bumps the client-go version
Modify the MCC, MCD and Tests to include the V1 PIS 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.

@RishabhSaini
Copy link
Copy Markdown
Contributor Author

Bumps the client-go version (currently points to PR branch, needs to point to master when merged)

Is comment out of date? It looks like openshift/client-go#314 merged and this appears to be pointing to the corresponding commit (f0faeb0f2f2e3b944101467a5eda96bc4fffe1e9)?

If so, lgtm but I'd defer final approval to others on the team.

You are right, I have updated the comment to reflect this

go.mod: Update the API and client-go
pinned_image_set: use the v1 instead of v1alpha1 PIS

Bump API and Client Go to latest
@RishabhSaini
Copy link
Copy Markdown
Contributor Author

Fixed the typo mentioned here: #4948 (comment)

@RishabhSaini
Copy link
Copy Markdown
Contributor Author

/test bootstrap-unit

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 28, 2025

@RishabhSaini: 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/bootstrap-unit 5e2b725 link false /test bootstrap-unit

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.

Copy link
Copy Markdown
Contributor

@djoshy djoshy left a comment

Choose a reason for hiding this comment

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

Looks good to me, with 1 non blocking question.

And sort of a minor nit, breaking out the vendor and the remaining changes into separate commits makes reviewing and looking at history a bit easier, but again this is also non blocking 😄

/lgtm

return ctx.Err()
default:
image := imageRef.Name
image := strings.TrimSpace(string(imageRef.Name))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could you clarify why this change was necessary? Some sort of new API validation?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

+1 Same, I'd like to know why we need this now. I see that the trimming is performed to the UID field too, that, iiuc, it's generated by k8s and cannot have whitespaces.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, RishabhSaini

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:
  • OWNERS [RishabhSaini,djoshy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit f46921d into openshift:main Mar 31, 2025
16 of 17 checks passed
@openshift-bot
Copy link
Copy Markdown
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-202503311810.p0.gf46921d.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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants