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

[release-0.16] 🌱 Rebase upstream #7

Closed
wants to merge 2 commits into from

Conversation

samuelvl
Copy link

@samuelvl samuelvl commented Dec 8, 2023

Update release-0.16 branch with last changes from upstream release-0.16 branch:

$ git diff upstream/release-0.16 HEAD
diff --git a/pkg/client/options.go b/pkg/client/options.go
index d81bf25d..ee6489b7 100644
--- a/pkg/client/options.go
+++ b/pkg/client/options.go
@@ -514,7 +514,8 @@ type MatchingLabels map[string]string
 func (m MatchingLabels) ApplyToList(opts *ListOptions) {
        // TODO(directxman12): can we avoid reserializing this over and over?
        if opts.LabelSelector == nil {
-               opts.LabelSelector = labels.NewSelector()
+               opts.LabelSelector = labels.SelectorFromValidatedSet(map[string]string(m))
+               return
        }
        // If there's already a selector, we need to AND the two together.
        noValidSel := labels.SelectorFromValidatedSet(map[string]string(m))

We need this fork because the perf issue fixed in kubernetes-sigs#2529 was not backported to the release-0.16 banch.

Bumps k8s depedencies to use 0.28.3 patch release as it
contains fixes for http2 rapid reset CVE

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
@samuelvl samuelvl changed the title [release-0.16] Rebase upstream [release-0.16] 🌱 Rebase upstream Dec 8, 2023
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
@samuelvl
Copy link
Author

samuelvl commented Dec 8, 2023

Closing since kubernetes-sigs#2529 has been backported to the release-0.16 banch.

@samuelvl samuelvl closed this Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants