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

✨ Rebase Kubernetes 1.31 #3160

Merged
merged 3 commits into from
Sep 19, 2024
Merged

✨ Rebase Kubernetes 1.31 #3160

merged 3 commits into from
Sep 19, 2024

Conversation

mjudeikis
Copy link
Contributor

@mjudeikis mjudeikis commented Sep 3, 2024 •
edited
Loading

Summary

In general, this was very smooth sailing. So smooth Im worried I missed something bit :)

Full diff can be found here, where I tool baseline 1.31 and this PR shows diff we currently carry as of 1.31 rebase:
https://github.com/kcp-dev/kubernetes/pull/147/commits

In general, most fixes were machinery-related:

  1. Queue type change in upstream
  2. Deprecation of stopCh (our change)
  3. Some control plane changes we landed post 1.30 cut
  4. Service account changes (getter of service account keys and our changes mostly)

In general a lot of sed/replace type of work.

Biggest issues still is code-generation, where we are on our own :)

Related issue(s)

Fixes #

Release Notes

Rebase 1.31

@kcp-ci-bot kcp-ci-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 3, 2024
@mjudeikis mjudeikis marked this pull request as draft September 3, 2024 17:37
@kcp-ci-bot kcp-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 3, 2024
@mjudeikis mjudeikis marked this pull request as ready for review September 5, 2024 17:48
@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 Sep 5, 2024
embik
embik requested changes Sep 9, 2024
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

Couple of nits, but overall looking really solid 👍🏻

@kcp-ci-bot kcp-ci-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 12, 2024
@mjudeikis mjudeikis changed the title ✨ rebase k/k 1.31 - pre-1 attempt ✨ Rebase Kubernetes 1.31 Sep 12, 2024
@kcp-ci-bot kcp-ci-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 12, 2024
embik
embik approved these changes Sep 15, 2024
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/lgtm

I'd just be very happy about a PR description documenting what had to be done for the 1.31 upgrade :)

@kcp-ci-bot kcp-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 15, 2024
@kcp-ci-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9290a2a43cf327d50020760b880886f4a0518678

@mjudeikis
Copy link
Contributor Author

I'd just be very happy about a PR description documenting what had to be done for the 1.31 upgrade :)

Added but needed to think what to add as it was so smooth :D

@kcp-ci-bot kcp-ci-bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 17, 2024
@kcp-ci-bot kcp-ci-bot requested a review from embik September 17, 2024 14:57
@kcp-ci-bot kcp-ci-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2024
@kcp-ci-bot kcp-ci-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2024
embik
embik approved these changes Sep 19, 2024
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/approve

@kcp-ci-bot kcp-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 19, 2024
@kcp-ci-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f4171e6e103314fa8dea225773c0f6f065ff99fd

@kcp-ci-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik

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 Sep 19, 2024
@kcp-ci-bot kcp-ci-bot merged commit e333cc1 into kcp-dev:main Sep 19, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@embik embik embik approved these changes

Assignees

@embik embik

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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mjudeikis @kcp-ci-bot @embik