Skip to content

✨ Rebase to v0.17.2 #48

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
Merged
merged 3 commits into from
Mar 9, 2024
Merged

✨ Rebase to v0.17.2 #48

merged 3 commits into from
Mar 9, 2024

Conversation

sttts
Copy link
Member

@sttts sttts commented Mar 9, 2024 •
edited
Loading

Forked v0.17.2 as kcp-0.17 and cherry-picked the kcp commit from kcp-1.28 branch.

@kcp-ci-bot kcp-ci-bot added 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. labels Mar 9, 2024
@sttts sttts force-pushed the sttts-kcp-0.17-rebase branch from 5c9ef1c to 0ae1a41 Compare March 9, 2024 16:24
mjudeikis
mjudeikis reviewed Mar 9, 2024
View reviewed changes
DOWNSTREAM_OWNERS Outdated
Comment on lines 2 to 8
- davidfestal
- ncdc
- stevekuznetsov
- sttts
reviewers:
- fabianvf
- varshaprasad96
Copy link

Choose a reason for hiding this comment

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

Still right?

Copy link
Member Author

Choose a reason for hiding this comment

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

good point. Let me clean up.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

mjudeikis
mjudeikis reviewed Mar 9, 2024
View reviewed changes
pkg/cache/internal/cache_reader.go Outdated
// KeyToClusteredKey prefixes the given index key with a cluster name
// for use in field selector indexes.
func KeyToClusteredKey(clusterName string, ns string, baseKey string) string {
return clusterName + "/" + KeyToNamespacedKey(ns, baseKey)
Copy link

Choose a reason for hiding this comment

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

Internally we use cluster|namespace/name. changing here?

Copy link
Member Author

Choose a reason for hiding this comment

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

yep, let's use the chance

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@mjudeikis
Copy link

/lgtm
Few comments

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

LGTM label has been added.

Git tree hash: 2252d8ba7bf0883c8bc4c876cbde3f2adbfa894d

@xrstf @sttts
UPSTREAM: <carry>: kcp modifications
5e7c0a7 
Signed-off-by: Dr. Stefan Schimanski <[email protected]>
@sttts sttts force-pushed the sttts-kcp-0.17-rebase branch from 0ae1a41 to 180f26f Compare March 9, 2024 16:49
@kcp-ci-bot kcp-ci-bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 9, 2024
@kcp-ci-bot kcp-ci-bot requested a review from mjudeikis March 9, 2024 16:49
@sttts sttts force-pushed the sttts-kcp-0.17-rebase branch 3 times, most recently from e647026 to 655355f Compare March 9, 2024 17:02
@mjudeikis
Copy link

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: ed3870c5efa8041646e8118a3e2c664535572761

@sttts
Copy link
Member Author

sttts commented Mar 9, 2024

/retest

@sttts sttts mentioned this pull request Mar 9, 2024
Merged
@sttts sttts force-pushed the sttts-kcp-0.17-rebase branch from 655355f to 7b5dce9 Compare March 9, 2024 17:16
@kcp-ci-bot kcp-ci-bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 9, 2024
@sttts
UPSTREAM: <drop>: Bump golangci-lint to 1.56.2
cae0049 
Fixes go.tmz.dev/musttag issue.

Signed-off-by: Dr. Stefan Schimanski <[email protected]>
@sttts sttts force-pushed the sttts-kcp-0.17-rebase branch from 091e138 to cae0049 Compare March 9, 2024 18:04
@sttts
Copy link
Member Author

sttts commented Mar 9, 2024

/lgtm
/approve

@kcp-ci-bot
Copy link

@sttts: you cannot LGTM your own PR.

In response to this:

/lgtm
/approve

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.

@sttts sttts added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 9, 2024
@kcp-ci-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: mjudeikis, sttts

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

@mjudeikis
Copy link

/lgtm

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

LGTM label has been added.

Git tree hash: f2bedc8386ceffbb27bbfef542eca086d1b3152a

@kcp-ci-bot kcp-ci-bot merged commit e8b4ff6 into kcp-dev:kcp-0.17 Mar 9, 2024
@sttts sttts deleted the sttts-kcp-0.17-rebase branch March 9, 2024 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjudeikis mjudeikis Awaiting requested review from mjudeikis

Assignees

@mjudeikis mjudeikis

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. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sttts @mjudeikis @kcp-ci-bot @xrstf