Skip to content

✨ Rebase to 0.19#59

Closed
tnthornton wants to merge 3 commits intokcp-dev:kcp-0.19from
tnthornton:tnthornton-kcp-0.19
Closed

✨ Rebase to 0.19#59
tnthornton wants to merge 3 commits intokcp-dev:kcp-0.19from
tnthornton:tnthornton-kcp-0.19

Conversation

@tnthornton
Copy link
Copy Markdown

@tnthornton tnthornton commented Sep 22, 2024

Rebased kcp-0.18 on top of kcp-0.19 (currently the branch from upstream).

This is currently needed for two reasons:

  1. Pull in lastest changes from controller-runtime.
  2. There was a signature change in utilruntime.PanicHandlers (0.31.0)

xrstf and others added 2 commits September 22, 2024 12:27
@xrstf @tnthornton
UPSTREAM: <carry>: kcp modifications
90a83e7 
Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>
@mjudeikis @tnthornton
UPSTREAM: <carry>: kcp example
9501bff 
Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>
@kcp-ci-bot
Copy link
Copy Markdown

kcp-ci-bot commented Sep 22, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Details 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 dco-signoff: no Indicates the PR's author has not signed the DCO. label Sep 22, 2024
@kcp-ci-bot
Copy link
Copy Markdown

kcp-ci-bot commented Sep 22, 2024

Hi @tnthornton. 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.

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

@kcp-ci-bot kcp-ci-bot added 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. labels Sep 22, 2024
@tnthornton
UPSTREAM: <carry>: logicalcluster paramerter rename
fdc16d3 
Signed-off-by: tnthornton <2375126+tnthornton@users.noreply.github.com>
@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 Sep 22, 2024
@tnthornton
Copy link
Copy Markdown
Author

tnthornton commented Sep 22, 2024

For some extra context, we started running into trouble with upgrading our k8s dependencies to 0.31.0+ due to the signature change in PanicHandlers. Happy to adjust any of the changes in here if I happened to miss a part of the process you all have going 👍

sttts
sttts reviewed Sep 23, 2024
View reviewed changes
Comment thread pkg/client/client.go
func NewAPIReader(config *rest.Config, options Options) (Reader, error) {
return New(config, options)
}

Copy link
Copy Markdown
Member

@sttts sttts Sep 23, 2024

Choose a reason for hiding this comment

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

in this file the last changes are missing, compare KcpClusterDiscoveryCacheSize and MapperWithContext.

Copy link
Copy Markdown
Member

@sttts sttts Sep 23, 2024

Choose a reason for hiding this comment

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

https://github.com/kcp-dev/controller-runtime/pull/57/files

Copy link
Copy Markdown
Author

@tnthornton tnthornton Sep 23, 2024

Choose a reason for hiding this comment

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

Weird, I wonder how I lost that 👀

@sttts
Copy link
Copy Markdown
Member

sttts commented Sep 23, 2024

Compared to https://github.com/kcp-dev/controller-runtime/compare/12cc8d59fabe3a1dbbd927ae6aea077cf7962267..kcp-0.18.

@sttts
Copy link
Copy Markdown
Member

sttts commented Sep 23, 2024

/ok-to-test

@kcp-ci-bot kcp-ci-bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 23, 2024
@kcp-ci-bot
Copy link
Copy Markdown

kcp-ci-bot commented Sep 23, 2024

@tnthornton: 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
pull-controller-runtime-everything fdc16d3 link true /test pull-controller-runtime-everything
pull-controller-runtime-example-e2e fdc16d3 link true /test pull-controller-runtime-example-e2e

Full PR test history

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

@tnthornton tnthornton mentioned this pull request Sep 23, 2024
Merged
@tnthornton tnthornton closed this Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sttts sttts sttts left review comments

Assignees

No one assigned

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

5 participants

@tnthornton @kcp-ci-bot @sttts @xrstf @mjudeikis