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.

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

✨ Rebase for k/k 1.32 #98

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

✨ Rebase for k/k 1.32 #98

wants to merge 6 commits into from

Conversation

gman0
Copy link

@gman0 gman0 commented Jan 6, 2025

Summary

This PR updates k8s to 1.32 and the kcp-dev/apimachinery dependencies.

Some changes that k8s.io/code-generator 0.32.0 offers are not part of this PR, specifically:

These may be added in separate PRs later.

Related issue(s)

Part of kcp-dev/kcp#3209

Release Notes

Updated dependencies for k8s 1.32

@kcp-ci-bot kcp-ci-bot added dco-signoff: yes Indicates the PR's author has signed the DCO. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 6, 2025
@kcp-ci-bot
Copy link
Contributor

Hi @gman0. Thanks for your PR.

I'm waiting for a kcp-dev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@gman0 gman0 marked this pull request as draft January 6, 2025 13:30
@kcp-ci-bot kcp-ci-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 6, 2025
examples/go.mod Outdated

replace acme.corp/pkg => ./pkg

replace github.com/kcp-dev/client-go => ./rebased_kcp/client-go
Copy link
Author

Choose a reason for hiding this comment

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

Dependency on client-go, which in turn depends on code-generator. Do we update examples/ in a separate PR?

Copy link
Member

Choose a reason for hiding this comment

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

Looking back at my PRs, I updated code-generator first: #90 and then client-go: kcp-dev/client-go#37.

But It's a little messy indeed.

Copy link
Member

Choose a reason for hiding this comment

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

(also see #75, btw)

Copy link
Author

Choose a reason for hiding this comment

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

Oki, leaving the client-go dependency for now.

@gman0 gman0 force-pushed the 1.32-prep branch 2 times, most recently from 03a5bd9 to 3803c22 Compare January 7, 2025 15:14
@kcp-ci-bot kcp-ci-bot added dco-signoff: no Indicates the PR's author has not signed the DCO. and removed dco-signoff: yes Indicates the PR's author has signed the DCO. labels Jan 7, 2025
@kcp-ci-bot kcp-ci-bot added dco-signoff: yes Indicates the PR's author has signed the DCO. and removed dco-signoff: no Indicates the PR's author has not signed the DCO. labels Jan 7, 2025
@gman0
Copy link
Author

gman0 commented Jan 7, 2025

I've restructured the commits a bit for hopefully easier review. Also, please see the links in the PR description related to the missing commits that are present in k8s.io/code-generator. Let me know if we should open issues to track progress on them.

@gman0 gman0 marked this pull request as ready for review January 7, 2025 15:37
@kcp-ci-bot kcp-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 Jan 7, 2025
@mjudeikis
Copy link
Contributor

/lgtm
/hold
/approve

waiting for other to review. For now this in the main, so once happy we can cut the release.

Maybe worth trying to use the "personal branch" to see if k/k fork will behave before merging?

@kcp-ci-bot kcp-ci-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jan 7, 2025
@kcp-ci-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8e02e39258a6a3d21b87040f1cd8965010cdb20b

@kcp-ci-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mjudeikis

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

@kcp-ci-bot kcp-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2025
@kcp-ci-bot
Copy link
Contributor

@gman0: 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
pull-code-generator-test 86be522 link true /test pull-code-generator-test

Full PR test history

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

@gman0
Copy link
Author

gman0 commented Jan 7, 2025

@mjudeikis yes, let's wait for the fork first! Still need to send the PR for client-go, and will continue with k/k fork rebase and if all goes well we can merge them all.

gman0 added 4 commits January 7, 2025 16:54
On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
Needed for go1.23.

On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
Needed for client-go v0.32.0.

On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
gman0 added 2 commits January 7, 2025 16:54
Ran 'make codegen'.

On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
@kcp-ci-bot kcp-ci-bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2025
@kcp-ci-bot kcp-ci-bot requested a review from mjudeikis January 7, 2025 15:54
@kcp-ci-bot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@gman0
Copy link
Author

gman0 commented Jan 7, 2025

I've missed setting the latest build image tag for the "pull-code-generator-test" prow job.

gman0 added a commit to gman0/kcp-client-go that referenced this pull request Jan 8, 2025
Using locally built code-generator.

    TODO: set this to a real version once kcp-dev/code-generator#98
    is merged!

On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>
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. dco-signoff: yes Indicates the PR's author has signed the DCO. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. 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.

4 participants