Update dependencies to v0.21.10 tag

Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b
2026-06-10 03:07:20 +00:00 · 2022-02-17 18:18:47 +00:00 · 2022-01-15 05:41:31 +00:00 · 2022-01-15 05:41:29 +00:00 · 2022-01-14 10:31:44 -08:00 · 2022-01-14 10:30:23 -08:00
6 changed files with 70 additions and 13 deletions
--- a/go.mod
+++ b/go.mod
@@ -27,15 +27,15 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	k8s.io/api v0.0.0-20211213212415-b0823650fd24
-	k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f
+	k8s.io/api v0.21.10
+	k8s.io/apimachinery v0.21.10
 	k8s.io/klog/v2 v2.9.0
 	k8s.io/utils v0.0.0-20210521133846-da695404a2bc
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1
 	sigs.k8s.io/yaml v1.2.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20211213212415-b0823650fd24
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f
+	k8s.io/api => k8s.io/api v0.21.10
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.10
 )
--- a/go.sum
+++ b/go.sum
@@ -417,10 +417,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20211213212415-b0823650fd24 h1:qKDdirI4QY7AWXRUxc7e4lStVbiKWZiIDsiBEnwQPbQ=
-k8s.io/api v0.0.0-20211213212415-b0823650fd24/go.mod h1:BGU4u94MF1y/vcHtu5OQCkZTp3e+byTeTkUVPmxFy7o=
-k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f h1:uWz5BkD3edSncqlTdY1u90s2oOSzyHfDOYjOQEHEvO8=
-k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f/go.mod h1:VdCLtKQwpSUQEWDaRsWR5ESDRqqhY2NeVzo9KCQ9uy0=
+k8s.io/api v0.21.10 h1:WKcYyNBZNMrE9yejBs0Lx70jGsOW8uUwkiA4ioxkz1Q=
+k8s.io/api v0.21.10/go.mod h1:5kqv2pCXwcrOvV12WhVAtLZUKaM0kyrZ6nHObw8SojA=
+k8s.io/apimachinery v0.21.10 h1:mOStSZoCrsxnAMIm5UtCNn6P328cJAhtzJToQYFsylc=
+k8s.io/apimachinery v0.21.10/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
@@ -433,7 +433,7 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/tools/pager/pager.go
+++ b/tools/pager/pager.go
@@ -78,6 +78,7 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti
 		options.Limit = p.PageSize
 	}
 	requestedResourceVersion := options.ResourceVersion
+	requestedResourceVersionMatch := options.ResourceVersionMatch
 	var list *metainternalversion.List
 	paginatedResult := false

@@ -102,6 +103,7 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti
 			options.Limit = 0
 			options.Continue = ""
 			options.ResourceVersion = requestedResourceVersion
+			options.ResourceVersionMatch = requestedResourceVersionMatch
 			result, err := p.PageFn(ctx, options)
 			return result, paginatedResult, err
 		}
@@ -135,10 +137,11 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti

 		// set the next loop up
 		options.Continue = m.GetContinue()
-		// Clear the ResourceVersion on the subsequent List calls to avoid the
+		// Clear the ResourceVersion(Match) on the subsequent List calls to avoid the
 		// `specifying resource version is not allowed when using continue` error.
 		// See https://github.com/kubernetes/kubernetes/issues/85221#issuecomment-553748143.
 		options.ResourceVersion = ""
+		options.ResourceVersionMatch = ""
 		// At this point, result is already paginated.
 		paginatedResult = true
 	}
--- a/tools/pager/pager_test.go
+++ b/tools/pager/pager_test.go
@@ -76,6 +76,10 @@ func (p *testPager) PagedList(ctx context.Context, options metav1.ListOptions) (
 		p.t.Errorf("invariant violated, specifying resource version (%s) is not allowed when using continue (%s).", options.ResourceVersion, options.Continue)
 		return nil, fmt.Errorf("invariant violated")
 	}
+	if options.Continue != "" && options.ResourceVersionMatch != "" {
+		p.t.Errorf("invariant violated, specifying resource version match type (%s) is not allowed when using continue (%s).", options.ResourceVersionMatch, options.Continue)
+		return nil, fmt.Errorf("invariant violated")
+	}
 	var list metainternalversion.List
 	total := options.Limit
 	if total == 0 {
@@ -201,6 +205,13 @@ func TestListPager_List(t *testing.T) {
 			want:      list(11, "rv:20"),
 			wantPaged: true,
 		},
+		{
+			name:      "two pages with resourceVersion and resourceVersionMatch",
+			fields:    fields{PageSize: 10, PageFn: (&testPager{t: t, expectPage: 10, remaining: 11, rv: "rv:20"}).PagedList},
+			args:      args{options: metav1.ListOptions{ResourceVersion: "rv:10", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan}},
+			want:      list(11, "rv:20"),
+			wantPaged: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
--- a/util/workqueue/queue.go
+++ b/util/workqueue/queue.go
@@ -155,7 +155,10 @@ func (q *Type) Get() (item interface{}, shutdown bool) {
 		return nil, true
 	}

-	item, q.queue = q.queue[0], q.queue[1:]
+	item = q.queue[0]
+	// The underlying array still exists and reference this object, so the object will not be garbage collected.
+	q.queue[0] = nil
+	q.queue = q.queue[1:]

 	q.metrics.get(item)

--- a/util/workqueue/queue_test.go
+++ b/util/workqueue/queue_test.go
@@ -17,10 +17,13 @@ limitations under the License.
 package workqueue_test

 import (
+	"runtime"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"

+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/workqueue"
 )

@@ -159,3 +162,40 @@ func TestReinsert(t *testing.T) {
 		t.Errorf("Expected queue to be empty. Has %v items", a)
 	}
 }
+
+// TestGarbageCollection ensures that objects that are added then removed from the queue are
+// able to be garbage collected.
+func TestGarbageCollection(t *testing.T) {
+	type bigObject struct {
+		data []byte
+	}
+	leakQueue := workqueue.New()
+	t.Cleanup(func() {
+		// Make sure leakQueue doesn't go out of scope too early
+		runtime.KeepAlive(leakQueue)
+	})
+	c := &bigObject{data: []byte("hello")}
+	mustGarbageCollect(t, c)
+	leakQueue.Add(c)
+	o, _ := leakQueue.Get()
+	leakQueue.Done(o)
+}
+
+// mustGarbageCollect asserts than an object was garbage collected by the end of the test.
+// The input must be a pointer to an object.
+func mustGarbageCollect(t *testing.T, i interface{}) {
+	t.Helper()
+	var collected int32 = 0
+	runtime.SetFinalizer(i, func(x interface{}) {
+		atomic.StoreInt32(&collected, 1)
+	})
+	t.Cleanup(func() {
+		if err := wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (done bool, err error) {
+			// Trigger GC explicitly, otherwise we may need to wait a long time for it to run
+			runtime.GC()
+			return atomic.LoadInt32(&collected) == 1, nil
+		}); err != nil {
+			t.Errorf("object was not garbage collected")
+		}
+	})
+}
Author	SHA1	Message	Date
Kubernetes Publisher	1dadc608ce	Update dependencies to v0.21.10 tag	2022-02-17 18:18:47 +00:00
Kubernetes Publisher	b3fbf6e096	Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b	2022-01-15 05:41:31 +00:00
Kubernetes Publisher	414618c60b	Merge pull request #106583 from hzxuzhonghu/automated-cherry-pick-of-#104991-#105031-origin-release-1.21 Automated cherry pick of #104991: Fix workqueue memory leak #105031: workqueue: fix leak in queue preventing objects from being Kubernetes-commit: 9d7f9092da28caba0e30274aa17089edeeda8e96	2022-01-15 05:41:29 +00:00
Jiahui Feng	8cbaa2fa3a	generated: ./hack/update-vendor.sh Kubernetes-commit: cea8bad2c6f0591527747a54c379eab3838b3cce	2022-01-14 10:31:44 -08:00
Jiahui Feng	1d723a9544	upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: f3184d2ca2dae501f64ecb3ce8daa83a6bc21d6c	2022-01-14 10:30:23 -08:00
Kubernetes Publisher	7bce839a5d	Merge pull request #107336 from fasaxc/automated-cherry-pick-of-#107311-upstream-release-1.21 Automated cherry pick of #107311: client-go: Clear the ResourceVersionMatch on paged list calls Kubernetes-commit: 9f84a2776c252e676ed5be7218723f729cff0166	2022-01-05 22:04:28 -08:00
Shaun Crampton	b5ec362b48	client-go: Clear the ResourceVersionMatch on paged list calls API server rejects continuations with ResourceVersionMatch set. Kubernetes-commit: 0ab23b50de524efa5592d08b1f77077699cb22ed	2022-01-04 16:05:32 +00:00
John Howard	c812fae4b4	workqueue: fix leak in queue preventing objects from being GCed See https://github.com/grpc/grpc-go/issues/4758 for a real world example of this leaking 2gb+ of data. Basically, when we do `q.queue[1:]` we are just repositioning the slice. The underlying array is still active, which contains the object formerly known as `q.queue[0]`. Because its referencing this object, it will not be GCed. The only thing that will trigger it to free is eventually when we add enough to the queue that we allocate a whole new array. Instead, we should explicitly clear out the old space when we remove it from the queue. This ensures the object can be GCed, assuming the users' application doesn't reference it anymore. Kubernetes-commit: 32ab81f15d43183ecc1a62e066c1759f08e624f3	2021-09-14 15:51:09 -07:00
xuzhonghu	efa1980cd4	Fix workqueue memory leak Kubernetes-commit: a802e788602ff6ad87e1cbeaf3fb5d6a6d874ba1	2021-09-14 09:53:53 +08:00