Skip to content

[release-0.16] 🌱 Rebase upstream#7

Closed
samuelvl wants to merge 2 commits intorelease-0.16from
samuelvl/rebase-release-0.16
Closed

[release-0.16] 🌱 Rebase upstream#7
samuelvl wants to merge 2 commits intorelease-0.16from
samuelvl/rebase-release-0.16

Conversation

@samuelvl
Copy link
Copy Markdown

@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 samuelvl force-pushed the samuelvl/rebase-release-0.16 branch from 893df0e to 345c72d Compare December 8, 2023 10:56
@samuelvl
Copy link
Copy Markdown
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

Development

Successfully merging this pull request may close these issues.

3 participants