Update dependencies to v0.23.2 tag

Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03
2026-06-14 22:08:39 +00:00 · 2022-01-19 21:45:06 +00:00 · 2022-01-15 05:54:30 +00:00 · 2022-01-14 10:58:50 -08:00 · 2022-01-14 10:30:23 -08:00 · 2022-01-06 13:41:15 +00:00
56 changed files with 393 additions and 452 deletions
--- a/32
+++ b/32
@@ -1,21 +1,21 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - caesarxuchao
-  - deads2k
-  - lavalamp
-  - liggitt
-  - smarterclayton
-  - sttts
-  - yliaog
+- caesarxuchao
+- deads2k
+- lavalamp
+- liggitt
+- smarterclayton
+- sttts
+- yliaog
 reviewers:
-  - caesarxuchao
-  - deads2k
-  - jpbetz
-  - lavalamp
-  - liggitt
-  - soltysh
-  - sttts
-  - yliaog
+- caesarxuchao
+- deads2k
+- jpbetz
+- lavalamp
+- liggitt
+- soltysh
+- sttts
+- yliaog
 labels:
-  - sig/api-machinery
+- sig/api-machinery
--- a/go.mod
+++ b/go.mod
@@ -30,16 +30,16 @@ require (
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	google.golang.org/protobuf v1.27.1
-	k8s.io/api v0.24.0-alpha.2
-	k8s.io/apimachinery v0.24.0-alpha.2
-	k8s.io/klog/v2 v2.40.1
+	k8s.io/api v0.23.2
+	k8s.io/apimachinery v0.23.2
+	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
-	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 	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.24.0-alpha.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.24.0-alpha.2
+	k8s.io/api => k8s.io/api v0.23.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.23.2
 )
--- a/go.sum
+++ b/go.sum
@@ -56,8 +56,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -407,8 +405,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
+golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -612,25 +610,25 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 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=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.24.0-alpha.2 h1:5uag2j7ZERcMQSAAUQcnFSpCHJL16gEwivaNW4noD0s=
-k8s.io/api v0.24.0-alpha.2/go.mod h1:rCC4mCXhKf6681LGiJFum6+8y5fy01wv/Io7ECQJkaA=
-k8s.io/apimachinery v0.24.0-alpha.2 h1:YjJD8ENFudWIYUptCU2RpnXy2B6PcK78Q7VK0KJtASw=
-k8s.io/apimachinery v0.24.0-alpha.2/go.mod h1:x0yrIIAdS2/JR9TKFHtSn8dYQDIw8mTIeAqPvOuEozA=
+k8s.io/api v0.23.2 h1:62cpzreV3dCuj0hqPi8r4dyWh48ogMcyh+ga9jEGij4=
+k8s.io/api v0.23.2/go.mod h1:sYuDb3flCtRPI8ghn6qFrcK5ZBu2mhbElxRE95qpwlI=
+k8s.io/apimachinery v0.23.2 h1:dBmjCOeYBdg2ibcQxMuUq+OopZ9fjfLIR5taP/XKeTs=
+k8s.io/apimachinery v0.23.2/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4=
-k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=
+k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo=
-k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 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/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
-sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
+sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
+sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 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=
--- a/kubernetes/typed/authentication/OWNERS
+++ b/kubernetes/typed/authentication/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authenticators-approvers
+- sig-auth-authenticators-approvers
 reviewers:
-  - sig-auth-authenticators-reviewers
+- sig-auth-authenticators-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/kubernetes/typed/authorization/OWNERS
+++ b/kubernetes/typed/authorization/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authorizers-approvers
+- sig-auth-authorizers-approvers
 reviewers:
-  - sig-auth-authorizers-reviewers
+- sig-auth-authorizers-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/kubernetes/typed/rbac/OWNERS
+++ b/kubernetes/typed/rbac/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authorizers-approvers
+- sig-auth-authorizers-approvers
 reviewers:
-  - sig-auth-authorizers-reviewers
+- sig-auth-authorizers-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/listers/apps/v1/daemonset_expansion.go
+++ b/listers/apps/v1/daemonset_expansion.go
@@ -60,8 +60,8 @@ func (s *daemonSetLister) GetPodDaemonSets(pod *v1.Pod) ([]*apps.DaemonSet, erro
 		}
 		selector, err = metav1.LabelSelectorAsSelector(daemonSet.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			// this should not happen if the DaemonSet passed validation
+			return nil, err
 		}

 		// If a daemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
@@ -96,8 +96,7 @@ func (s *daemonSetLister) GetHistoryDaemonSets(history *apps.ControllerRevision)
 	for _, ds := range list {
 		selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the history
-			continue
+			return nil, fmt.Errorf("invalid label selector: %v", err)
 		}
 		// If a DaemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
 		if selector.Empty() || !selector.Matches(labels.Set(history.Labels)) {
--- a/listers/apps/v1/replicaset_expansion.go
+++ b/listers/apps/v1/replicaset_expansion.go
@@ -55,8 +55,7 @@ func (s *replicaSetLister) GetPodReplicaSets(pod *v1.Pod) ([]*apps.ReplicaSet, e
 		}
 		selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a ReplicaSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/apps/v1/statefulset_expansion.go
+++ b/listers/apps/v1/statefulset_expansion.go
@@ -59,8 +59,7 @@ func (s *statefulSetLister) GetPodStatefulSets(pod *v1.Pod) ([]*apps.StatefulSet
 		}
 		selector, err = metav1.LabelSelectorAsSelector(ps.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a StatefulSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/apps/v1beta1/statefulset_expansion.go
+++ b/listers/apps/v1beta1/statefulset_expansion.go
@@ -59,8 +59,7 @@ func (s *statefulSetLister) GetPodStatefulSets(pod *v1.Pod) ([]*apps.StatefulSet
 		}
 		selector, err = metav1.LabelSelectorAsSelector(ps.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a StatefulSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/apps/v1beta2/daemonset_expansion.go
+++ b/listers/apps/v1beta2/daemonset_expansion.go
@@ -60,8 +60,8 @@ func (s *daemonSetLister) GetPodDaemonSets(pod *v1.Pod) ([]*apps.DaemonSet, erro
 		}
 		selector, err = metav1.LabelSelectorAsSelector(daemonSet.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			// this should not happen if the DaemonSet passed validation
+			return nil, err
 		}

 		// If a daemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
@@ -96,8 +96,7 @@ func (s *daemonSetLister) GetHistoryDaemonSets(history *apps.ControllerRevision)
 	for _, ds := range list {
 		selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the history object
-			continue
+			return nil, fmt.Errorf("invalid label selector: %v", err)
 		}
 		// If a DaemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
 		if selector.Empty() || !selector.Matches(labels.Set(history.Labels)) {
--- a/listers/apps/v1beta2/replicaset_expansion.go
+++ b/listers/apps/v1beta2/replicaset_expansion.go
@@ -55,8 +55,7 @@ func (s *replicaSetLister) GetPodReplicaSets(pod *v1.Pod) ([]*apps.ReplicaSet, e
 		}
 		selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a ReplicaSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/apps/v1beta2/statefulset_expansion.go
+++ b/listers/apps/v1beta2/statefulset_expansion.go
@@ -59,8 +59,7 @@ func (s *statefulSetLister) GetPodStatefulSets(pod *v1.Pod) ([]*apps.StatefulSet
 		}
 		selector, err = metav1.LabelSelectorAsSelector(ps.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a StatefulSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/authentication/OWNERS
+++ b/listers/authentication/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authenticators-approvers
+- sig-auth-authenticators-approvers
 reviewers:
-  - sig-auth-authenticators-reviewers
+- sig-auth-authenticators-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/listers/authorization/OWNERS
+++ b/listers/authorization/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authorizers-approvers
+- sig-auth-authorizers-approvers
 reviewers:
-  - sig-auth-authorizers-reviewers
+- sig-auth-authorizers-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/listers/batch/v1/job_expansion.go
+++ b/listers/batch/v1/job_expansion.go
@@ -51,11 +51,7 @@ func (l *jobLister) GetPodJobs(pod *v1.Pod) (jobs []batch.Job, err error) {
 		return
 	}
 	for _, job := range list {
-		selector, err := metav1.LabelSelectorAsSelector(job.Spec.Selector)
-		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
-		}
+		selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector)
 		if !selector.Matches(labels.Set(pod.Labels)) {
 			continue
 		}
--- a/listers/extensions/v1beta1/daemonset_expansion.go
+++ b/listers/extensions/v1beta1/daemonset_expansion.go
@@ -61,8 +61,8 @@ func (s *daemonSetLister) GetPodDaemonSets(pod *v1.Pod) ([]*v1beta1.DaemonSet, e
 		}
 		selector, err = metav1.LabelSelectorAsSelector(daemonSet.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			// this should not happen if the DaemonSet passed validation
+			return nil, err
 		}

 		// If a daemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
@@ -97,8 +97,7 @@ func (s *daemonSetLister) GetHistoryDaemonSets(history *apps.ControllerRevision)
 	for _, ds := range list {
 		selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the history object
-			continue
+			return nil, fmt.Errorf("invalid label selector: %v", err)
 		}
 		// If a DaemonSet with a nil or empty selector creeps in, it should match nothing, not everything.
 		if selector.Empty() || !selector.Matches(labels.Set(history.Labels)) {
--- a/listers/extensions/v1beta1/replicaset_expansion.go
+++ b/listers/extensions/v1beta1/replicaset_expansion.go
@@ -55,8 +55,7 @@ func (s *replicaSetLister) GetPodReplicaSets(pod *v1.Pod) ([]*extensions.Replica
 		}
 		selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
-			continue
+			return nil, fmt.Errorf("invalid selector: %v", err)
 		}

 		// If a ReplicaSet with a nil or empty selector creeps in, it should match nothing, not everything.
--- a/listers/policy/v1/poddisruptionbudget_expansion.go
+++ b/listers/policy/v1/poddisruptionbudget_expansion.go
@@ -23,6 +23,7 @@ import (
 	policy "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/klog/v2"
 )

 // PodDisruptionBudgetListerExpansion allows custom methods to be added to
@@ -49,7 +50,7 @@ func (s *podDisruptionBudgetLister) GetPodPodDisruptionBudgets(pod *v1.Pod) ([]*
 		pdb := list[i]
 		selector, err = metav1.LabelSelectorAsSelector(pdb.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
+			klog.Warningf("invalid selector: %v", err)
 			continue
 		}

--- a/listers/policy/v1beta1/poddisruptionbudget_expansion.go
+++ b/listers/policy/v1beta1/poddisruptionbudget_expansion.go
@@ -23,6 +23,7 @@ import (
 	policy "k8s.io/api/policy/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/klog/v2"
 )

 // PodDisruptionBudgetListerExpansion allows custom methods to be added to
@@ -49,7 +50,8 @@ func (s *podDisruptionBudgetLister) GetPodPodDisruptionBudgets(pod *v1.Pod) ([]*
 		pdb := list[i]
 		selector, err = metav1.LabelSelectorAsSelector(pdb.Spec.Selector)
 		if err != nil {
-			// This object has an invalid selector, it does not match the pod
+			klog.Warningf("invalid selector: %v", err)
+			// TODO(mml): add an event to the PDB
 			continue
 		}

--- a/listers/rbac/OWNERS
+++ b/listers/rbac/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authorizers-approvers
+- sig-auth-authorizers-approvers
 reviewers:
-  - sig-auth-authorizers-reviewers
+- sig-auth-authorizers-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/metadata/fake/simple.go
+++ b/metadata/fake/simple.go
@@ -60,7 +60,7 @@ func NewSimpleMetadataClient(scheme *runtime.Scheme, objects ...runtime.Object)
 		}
 	}

-	cs := &FakeMetadataClient{scheme: scheme, tracker: o}
+	cs := &FakeMetadataClient{scheme: scheme}
 	cs.AddReactor("*", "*", testing.ObjectReaction(o))
 	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
 		gvr := action.GetResource()
@@ -80,8 +80,7 @@ func NewSimpleMetadataClient(scheme *runtime.Scheme, objects ...runtime.Object)
 // you want to test easier.
 type FakeMetadataClient struct {
 	testing.Fake
-	scheme  *runtime.Scheme
-	tracker testing.ObjectTracker
+	scheme *runtime.Scheme
 }

 type metadataResourceClient struct {
@@ -90,14 +89,7 @@ type metadataResourceClient struct {
 	resource  schema.GroupVersionResource
 }

-var (
-	_ metadata.Interface = &FakeMetadataClient{}
-	_ testing.FakeClient = &FakeMetadataClient{}
-)
-
-func (c *FakeMetadataClient) Tracker() testing.ObjectTracker {
-	return c.tracker
-}
+var _ metadata.Interface = &FakeMetadataClient{}

 // Resource returns an interface for accessing the provided resource.
 func (c *FakeMetadataClient) Resource(resource schema.GroupVersionResource) metadata.Getter {
--- a/pkg/apis/clientauthentication/OWNERS
+++ b/pkg/apis/clientauthentication/OWNERS
@@ -2,7 +2,8 @@

 # approval on api packages bubbles to api-approvers
 reviewers:
-  - sig-auth-authenticators-approvers
-  - sig-auth-authenticators-reviewers
+- sig-auth-authenticators-approvers
+- sig-auth-authenticators-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/plugin/pkg/client/auth/OWNERS
+++ b/plugin/pkg/client/auth/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authenticators-approvers
+- sig-auth-authenticators-approvers
 reviewers:
-  - sig-auth-authenticators-reviewers
+- sig-auth-authenticators-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/plugin/pkg/client/auth/gcp/OWNERS
+++ b/plugin/pkg/client/auth/gcp/OWNERS
@@ -1,8 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - cjcullen
+- cjcullen
+- jlowdermilk
 reviewers:
-  - cjcullen
-emeritus_approvers:
-  - jlowdermilk
+- cjcullen
+- jlowdermilk
--- a/rest/OWNERS
+++ b/rest/OWNERS
@@ -1,14 +1,22 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 reviewers:
-  - thockin
-  - smarterclayton
-  - caesarxuchao
-  - wojtek-t
-  - deads2k
-  - liggitt
-  - sttts
-  - luxas
-  - dims
-  - cjcullen
-  - lojies
+- thockin
+- smarterclayton
+- caesarxuchao
+- wojtek-t
+- deads2k
+- brendandburns
+- liggitt
+- sttts
+- luxas
+- dims
+- errordeveloper
+- hongchaodeng
+- krousey
+- resouer
+- cjcullen
+- rmmh
+- asalkeld
+- juanvallejo
+- lojies
--- a/testing/fixture_test.go
+++ b/testing/fixture_test.go
@@ -46,6 +46,7 @@ func getArbitraryResource(s schema.GroupVersionResource, name, namespace string)
 				"generateName":    "test_generateName",
 				"uid":             "test_uid",
 				"resourceVersion": "test_resourceVersion",
+				"selfLink":        "test_selfLink",
 			},
 			"data": strconv.Itoa(rand.Int()),
 		},
--- a/tools/auth/OWNERS
+++ b/tools/auth/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-authenticators-approvers
+- sig-auth-authenticators-approvers
 reviewers:
-  - sig-auth-authenticators-reviewers
+- sig-auth-authenticators-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/tools/cache/OWNERS
+++ b/tools/cache/OWNERS
@@ -1,28 +1,38 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - thockin
-  - lavalamp
-  - smarterclayton
-  - wojtek-t
-  - deads2k
-  - caesarxuchao
-  - liggitt
-  - ncdc
+- thockin
+- lavalamp
+- smarterclayton
+- wojtek-t
+- deads2k
+- caesarxuchao
+- liggitt
+- ncdc
 reviewers:
-  - thockin
-  - lavalamp
-  - smarterclayton
-  - wojtek-t
-  - deads2k
-  - derekwaynecarr
-  - caesarxuchao
-  - mikedanese
-  - liggitt
-  - janetkuo
-  - justinsb
-  - soltysh
-  - jsafrane
-  - dims
-  - ingvagabund
-  - ncdc
+- thockin
+- lavalamp
+- smarterclayton
+- wojtek-t
+- deads2k
+- brendandburns
+- derekwaynecarr
+- caesarxuchao
+- mikedanese
+- liggitt
+- davidopp
+- pmorie
+- janetkuo
+- justinsb
+- soltysh
+- jsafrane
+- dims
+- hongchaodeng
+- krousey
+- xiang90
+- ingvagabund
+- resouer
+- jessfraz
+- mfojtik
+- sdminonne
+- ncdc
--- a/tools/cache/controller.go
+++ b/tools/cache/controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package cache

 import (
-	"errors"
 	"sync"
 	"time"

@@ -371,8 +370,8 @@ type TransformFunc func(interface{}) (interface{}, error)
 // the returned Store for Get/List operations; Add/Modify/Deletes will cause
 // the event notifications to be faulty.
 // The given transform function will be called on all objects before they will
-// put into the Store and corresponding Add/Modify/Delete handlers will
-// be invoked for them.
+// put put into the Store and corresponding Add/Modify/Delete handlers will
+// be invokved for them.
 func NewTransformingInformer(
 	lw ListerWatcher,
 	objType runtime.Object,
@@ -407,49 +406,6 @@ func NewTransformingIndexerInformer(
 	return clientState, newInformer(lw, objType, resyncPeriod, h, clientState, transformer)
 }

-// Multiplexes updates in the form of a list of Deltas into a Store, and informs
-// a given handler of events OnUpdate, OnAdd, OnDelete
-func processDeltas(
-	// Object which receives event notifications from the given deltas
-	handler ResourceEventHandler,
-	clientState Store,
-	transformer TransformFunc,
-	deltas Deltas,
-) error {
-	// from oldest to newest
-	for _, d := range deltas {
-		obj := d.Object
-		if transformer != nil {
-			var err error
-			obj, err = transformer(obj)
-			if err != nil {
-				return err
-			}
-		}
-
-		switch d.Type {
-		case Sync, Replaced, Added, Updated:
-			if old, exists, err := clientState.Get(obj); err == nil && exists {
-				if err := clientState.Update(obj); err != nil {
-					return err
-				}
-				handler.OnUpdate(old, obj)
-			} else {
-				if err := clientState.Add(obj); err != nil {
-					return err
-				}
-				handler.OnAdd(obj)
-			}
-		case Deleted:
-			if err := clientState.Delete(obj); err != nil {
-				return err
-			}
-			handler.OnDelete(obj)
-		}
-	}
-	return nil
-}
-
 // newInformer returns a controller for populating the store while also
 // providing event notifications.
 //
@@ -488,10 +444,38 @@ func newInformer(
 		RetryOnError:     false,

 		Process: func(obj interface{}) error {
-			if deltas, ok := obj.(Deltas); ok {
-				return processDeltas(h, clientState, transformer, deltas)
+			// from oldest to newest
+			for _, d := range obj.(Deltas) {
+				obj := d.Object
+				if transformer != nil {
+					var err error
+					obj, err = transformer(obj)
+					if err != nil {
+						return err
+					}
+				}
+
+				switch d.Type {
+				case Sync, Replaced, Added, Updated:
+					if old, exists, err := clientState.Get(obj); err == nil && exists {
+						if err := clientState.Update(obj); err != nil {
+							return err
+						}
+						h.OnUpdate(old, obj)
+					} else {
+						if err := clientState.Add(obj); err != nil {
+							return err
+						}
+						h.OnAdd(obj)
+					}
+				case Deleted:
+					if err := clientState.Delete(obj); err != nil {
+						return err
+					}
+					h.OnDelete(obj)
+				}
 			}
-			return errors.New("object given as Process argument is not Deltas")
+			return nil
 		},
 	}
 	return New(cfg)
--- a/tools/cache/reflector.go
+++ b/tools/cache/reflector.go
@@ -231,7 +231,7 @@ var (

 	// Used to indicate that watching stopped because of a signal from the stop
 	// channel passed in from a client of the reflector.
-	errorStopRequested = errors.New("stop requested")
+	errorStopRequested = errors.New("Stop requested")
 )

 // resyncChan returns a channel which will receive something when a resync is
@@ -258,7 +258,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 	options := metav1.ListOptions{ResourceVersion: r.relistResourceVersion()}

 	if err := func() error {
-		initTrace := trace.New("Reflector ListAndWatch", trace.Field{Key: "name", Value: r.name})
+		initTrace := trace.New("Reflector ListAndWatch", trace.Field{"name", r.name})
 		defer initTrace.LogIfLong(10 * time.Second)
 		var list runtime.Object
 		var paginatedResult bool
@@ -319,7 +319,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 			panic(r)
 		case <-listCh:
 		}
-		initTrace.Step("Objects listed", trace.Field{Key: "error", Value: err})
+		initTrace.Step("Objects listed", trace.Field{"error", err})
 		if err != nil {
 			klog.Warningf("%s: failed to list %v: %v", r.name, r.expectedTypeName, err)
 			return fmt.Errorf("failed to list %v: %v", r.expectedTypeName, err)
@@ -401,7 +401,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 		timeoutSeconds := int64(minWatchTimeout.Seconds() * (rand.Float64() + 1.0))
 		options = metav1.ListOptions{
 			ResourceVersion: resourceVersion,
-			// We want to avoid situations of hanging watchers. Stop any watchers that do not
+			// We want to avoid situations of hanging watchers. Stop any wachers that do not
 			// receive any events within the timeout window.
 			TimeoutSeconds: &timeoutSeconds,
 			// To reduce load on kube-apiserver on watch restarts, you may enable watch bookmarks.
--- a/tools/cache/reflector_test.go
+++ b/tools/cache/reflector_test.go
@@ -813,6 +813,7 @@ func TestReflectorFullListIfExpired(t *testing.T) {
 				t.Error(err)
 				return nil, err
 			}
+			return nil, nil
 		},
 	}
 	r := NewReflector(lw, &v1.Pod{}, s, 0)
--- a/tools/cache/shared_informer.go
+++ b/tools/cache/shared_informer.go
@@ -17,7 +17,6 @@ limitations under the License.
 package cache

 import (
-	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -181,20 +180,6 @@ type SharedInformer interface {
 	// The handler should return quickly - any expensive processing should be
 	// offloaded.
 	SetWatchErrorHandler(handler WatchErrorHandler) error
-
-	// The TransformFunc is called for each object which is about to be stored.
-	//
-	// This function is intended for you to take the opportunity to
-	// remove, transform, or normalize fields. One use case is to strip unused
-	// metadata fields out of objects to save on RAM cost.
-	//
-	// Must be set before starting the informer.
-	//
-	// Note: Since the object given to the handler may be already shared with
-	//	other goroutines, it is advisable to copy the object being
-	//  transform before mutating it at all and returning the copy to prevent
-	//	data races.
-	SetTransform(handler TransformFunc) error
 }

 // SharedIndexInformer provides add and get Indexers ability based on SharedInformer.
@@ -259,7 +244,7 @@ func WaitForNamedCacheSync(controllerName string, stopCh <-chan struct{}, cacheS
 		return false
 	}

-	klog.Infof("Caches are synced for %s", controllerName)
+	klog.Infof("Caches are synced for %s ", controllerName)
 	return true
 }

@@ -333,8 +318,6 @@ type sharedIndexInformer struct {

 	// Called whenever the ListAndWatch drops the connection with an error.
 	watchErrorHandler WatchErrorHandler
-
-	transform TransformFunc
 }

 // dummyController hides the fact that a SharedInformer is different from a dedicated one
@@ -382,18 +365,6 @@ func (s *sharedIndexInformer) SetWatchErrorHandler(handler WatchErrorHandler) er
 	return nil
 }

-func (s *sharedIndexInformer) SetTransform(handler TransformFunc) error {
-	s.startedLock.Lock()
-	defer s.startedLock.Unlock()
-
-	if s.started {
-		return fmt.Errorf("informer has already started")
-	}
-
-	s.transform = handler
-	return nil
-}
-
 func (s *sharedIndexInformer) Run(stopCh <-chan struct{}) {
 	defer utilruntime.HandleCrash()

@@ -567,47 +538,45 @@ func (s *sharedIndexInformer) HandleDeltas(obj interface{}) error {
 	s.blockDeltas.Lock()
 	defer s.blockDeltas.Unlock()

-	if deltas, ok := obj.(Deltas); ok {
-		return processDeltas(s, s.indexer, s.transform, deltas)
-	}
-	return errors.New("object given as Process argument is not Deltas")
-}
+	// from oldest to newest
+	for _, d := range obj.(Deltas) {
+		switch d.Type {
+		case Sync, Replaced, Added, Updated:
+			s.cacheMutationDetector.AddObject(d.Object)
+			if old, exists, err := s.indexer.Get(d.Object); err == nil && exists {
+				if err := s.indexer.Update(d.Object); err != nil {
+					return err
+				}

-// Conforms to ResourceEventHandler
-func (s *sharedIndexInformer) OnAdd(obj interface{}) {
-	// Invocation of this function is locked under s.blockDeltas, so it is
-	// save to distribute the notification
-	s.cacheMutationDetector.AddObject(obj)
-	s.processor.distribute(addNotification{newObj: obj}, false)
-}
-
-// Conforms to ResourceEventHandler
-func (s *sharedIndexInformer) OnUpdate(old, new interface{}) {
-	isSync := false
-
-	// If is a Sync event, isSync should be true
-	// If is a Replaced event, isSync is true if resource version is unchanged.
-	// If RV is unchanged: this is a Sync/Replaced event, so isSync is true
-
-	if accessor, err := meta.Accessor(new); err == nil {
-		if oldAccessor, err := meta.Accessor(old); err == nil {
-			// Events that didn't change resourceVersion are treated as resync events
-			// and only propagated to listeners that requested resync
-			isSync = accessor.GetResourceVersion() == oldAccessor.GetResourceVersion()
+				isSync := false
+				switch {
+				case d.Type == Sync:
+					// Sync events are only propagated to listeners that requested resync
+					isSync = true
+				case d.Type == Replaced:
+					if accessor, err := meta.Accessor(d.Object); err == nil {
+						if oldAccessor, err := meta.Accessor(old); err == nil {
+							// Replaced events that didn't change resourceVersion are treated as resync events
+							// and only propagated to listeners that requested resync
+							isSync = accessor.GetResourceVersion() == oldAccessor.GetResourceVersion()
+						}
+					}
+				}
+				s.processor.distribute(updateNotification{oldObj: old, newObj: d.Object}, isSync)
+			} else {
+				if err := s.indexer.Add(d.Object); err != nil {
+					return err
+				}
+				s.processor.distribute(addNotification{newObj: d.Object}, false)
+			}
+		case Deleted:
+			if err := s.indexer.Delete(d.Object); err != nil {
+				return err
+			}
+			s.processor.distribute(deleteNotification{oldObj: d.Object}, false)
 		}
 	}
-
-	// Invocation of this function is locked under s.blockDeltas, so it is
-	// save to distribute the notification
-	s.cacheMutationDetector.AddObject(new)
-	s.processor.distribute(updateNotification{oldObj: old, newObj: new}, isSync)
-}
-
-// Conforms to ResourceEventHandler
-func (s *sharedIndexInformer) OnDelete(old interface{}) {
-	// Invocation of this function is locked under s.blockDeltas, so it is
-	// save to distribute the notification
-	s.processor.distribute(deleteNotification{oldObj: old}, false)
+	return nil
 }

 // sharedProcessor has a collection of processorListener and can
--- a/tools/cache/shared_informer_test.go
+++ b/tools/cache/shared_informer_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"

-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -357,36 +357,3 @@ func TestSharedInformerErrorHandling(t *testing.T) {
 	}
 	close(stop)
 }
-
-func TestSharedInformerTransformer(t *testing.T) {
-	// source simulates an apiserver object endpoint.
-	source := fcache.NewFakeControllerSource()
-
-	source.Add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod1", UID: "pod1", ResourceVersion: "1"}})
-	source.Add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod2", UID: "pod2", ResourceVersion: "2"}})
-
-	informer := NewSharedInformer(source, &v1.Pod{}, 1*time.Second).(*sharedIndexInformer)
-	informer.SetTransform(func(obj interface{}) (interface{}, error) {
-		if pod, ok := obj.(*v1.Pod); ok {
-			name := pod.GetName()
-
-			if upper := strings.ToUpper(name); upper != name {
-				copied := pod.DeepCopyObject().(*v1.Pod)
-				copied.SetName(upper)
-				return copied, nil
-			}
-		}
-		return obj, nil
-	})
-
-	listenerTransformer := newTestListener("listenerTransformer", 0, "POD1", "POD2")
-	informer.AddEventHandler(listenerTransformer)
-
-	stop := make(chan struct{})
-	go informer.Run(stop)
-	defer close(stop)
-
-	if !listenerTransformer.ok() {
-		t.Errorf("%s: expected %v, got %v", listenerTransformer.name, listenerTransformer.expectedItemNames, listenerTransformer.receivedItemNames)
-	}
-}
--- a/tools/cache/thread_safe_store.go
+++ b/tools/cache/thread_safe_store.go
@@ -71,7 +71,11 @@ type threadSafeMap struct {
 }

 func (c *threadSafeMap) Add(key string, obj interface{}) {
-	c.Update(key, obj)
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	oldObject := c.items[key]
+	c.items[key] = obj
+	c.updateIndices(oldObject, obj, key)
 }

 func (c *threadSafeMap) Update(key string, obj interface{}) {
--- a/tools/clientcmd/overrides.go
+++ b/tools/clientcmd/overrides.go
@@ -73,7 +73,6 @@ type ClusterOverrideFlags struct {
 	CertificateAuthority  FlagInfo
 	InsecureSkipTLSVerify FlagInfo
 	TLSServerName         FlagInfo
-	ProxyURL              FlagInfo
 }

 // FlagInfo contains information about how to register a flag.  This struct is useful if you want to provide a way for an extender to
@@ -161,7 +160,6 @@ const (
 	FlagUsername         = "username"
 	FlagPassword         = "password"
 	FlagTimeout          = "request-timeout"
-	FlagProxyURL         = "proxy-url"
 )

 // RecommendedConfigOverrideFlags is a convenience method to return recommended flag names prefixed with a string of your choosing
@@ -197,7 +195,6 @@ func RecommendedClusterOverrideFlags(prefix string) ClusterOverrideFlags {
 		CertificateAuthority:  FlagInfo{prefix + FlagCAFile, "", "", "Path to a cert file for the certificate authority"},
 		InsecureSkipTLSVerify: FlagInfo{prefix + FlagInsecure, "", "false", "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure"},
 		TLSServerName:         FlagInfo{prefix + FlagTLSServerName, "", "", "If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used."},
-		ProxyURL:              FlagInfo{prefix + FlagProxyURL, "", "", "If provided, this URL will be used to connect via proxy"},
 	}
 }

@@ -237,7 +234,6 @@ func BindClusterFlags(clusterInfo *clientcmdapi.Cluster, flags *pflag.FlagSet, f
 	flagNames.CertificateAuthority.BindStringFlag(flags, &clusterInfo.CertificateAuthority)
 	flagNames.InsecureSkipTLSVerify.BindBoolFlag(flags, &clusterInfo.InsecureSkipTLSVerify)
 	flagNames.TLSServerName.BindStringFlag(flags, &clusterInfo.TLSServerName)
-	flagNames.ProxyURL.BindStringFlag(flags, &clusterInfo.ProxyURL)
 }

 // BindFlags is a convenience method to bind the specified flags to their associated variables
--- a/tools/events/OWNERS
+++ b/tools/events/OWNERS
@@ -1,10 +1,10 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-instrumentation-approvers
-  - wojtek-t
+- sig-instrumentation-approvers
+- yastij
+- wojtek-t
 reviewers:
-  - sig-instrumentation-reviewers
-  - wojtek-t
-emeritus_approvers:
-  - yastij
+- sig-instrumentation-reviewers
+- yastij
+- wojtek-t
--- a/tools/events/eventseries_test.go
+++ b/tools/events/eventseries_test.go
@@ -216,6 +216,7 @@ func TestFinishSeries(t *testing.T) {
 	hostname, _ := os.Hostname()
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "bar",
@@ -287,6 +288,7 @@ func TestRefreshExistingEventSeries(t *testing.T) {
 	hostname, _ := os.Hostname()
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "bar",
--- a/tools/leaderelection/OWNERS
+++ b/tools/leaderelection/OWNERS
@@ -1,11 +1,12 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - mikedanese
+- mikedanese
+- timothysc
 reviewers:
-  - wojtek-t
-  - deads2k
-  - mikedanese
-  - ingvagabund
-emeritus_approvers:
-  - timothysc
+- wojtek-t
+- deads2k
+- mikedanese
+- timothysc
+- ingvagabund
+- resouer
--- a/tools/leaderelection/leaderelection_test.go
+++ b/tools/leaderelection/leaderelection_test.go
@@ -66,6 +66,11 @@ func createLockObject(t *testing.T, objectType, namespace, name string, record *
 	return
 }

+// Will test leader election using endpoints as the resource
+func TestTryAcquireOrRenewEndpoints(t *testing.T) {
+	testTryAcquireOrRenew(t, "endpoints")
+}
+
 type Reactor struct {
 	verb       string
 	objectType string
@@ -254,14 +259,24 @@ func testTryAcquireOrRenew(t *testing.T, objectType string) {
 			})

 			switch objectType {
+			case "endpoints":
+				lock = &rl.EndpointsLock{
+					EndpointsMeta: objectMeta,
+					LockConfig:    resourceLockConfig,
+					Client:        c.CoreV1(),
+				}
+			case "configmaps":
+				lock = &rl.ConfigMapLock{
+					ConfigMapMeta: objectMeta,
+					LockConfig:    resourceLockConfig,
+					Client:        c.CoreV1(),
+				}
 			case "leases":
 				lock = &rl.LeaseLock{
 					LeaseMeta:  objectMeta,
 					LockConfig: resourceLockConfig,
 					Client:     c.CoordinationV1(),
 				}
-			default:
-				t.Fatalf("Unknown objectType: %v", objectType)
 			}

 			lec := LeaderElectionConfig{
@@ -310,6 +325,11 @@ func testTryAcquireOrRenew(t *testing.T, objectType string) {
 	}
 }

+// Will test leader election using configmap as the resource
+func TestTryAcquireOrRenewConfigMaps(t *testing.T) {
+	testTryAcquireOrRenew(t, "configmaps")
+}
+
 // Will test leader election using lease as the resource
 func TestTryAcquireOrRenewLeases(t *testing.T) {
 	testTryAcquireOrRenew(t, "leases")
@@ -344,9 +364,9 @@ func TestLeaseSpecToLeaderElectionRecordRoundTrip(t *testing.T) {
 func multiLockType(t *testing.T, objectType string) (primaryType, secondaryType string) {
 	switch objectType {
 	case rl.EndpointsLeasesResourceLock:
-		return "endpoints", rl.LeasesResourceLock
+		return rl.EndpointsResourceLock, rl.LeasesResourceLock
 	case rl.ConfigMapsLeasesResourceLock:
-		return "configmaps", rl.LeasesResourceLock
+		return rl.ConfigMapsResourceLock, rl.LeasesResourceLock
 	default:
 		t.Fatal("unexpected objType:" + objectType)
 	}
@@ -798,7 +818,9 @@ func testTryAcquireOrRenewMultiLock(t *testing.T, objectType string) {
 			var wg sync.WaitGroup
 			wg.Add(1)
 			var reportedLeader string
+			var lock rl.Interface

+			objectMeta := metav1.ObjectMeta{Namespace: "foo", Name: "bar"}
 			resourceLockConfig := rl.ResourceLockConfig{
 				Identity:      "baz",
 				EventRecorder: &record.FakeRecorder{},
@@ -812,9 +834,33 @@ func testTryAcquireOrRenewMultiLock(t *testing.T, objectType string) {
 				return true, nil, fmt.Errorf("unreachable action")
 			})

-			lock, err := rl.New(objectType, "foo", "bar", c.CoreV1(), c.CoordinationV1(), resourceLockConfig)
-			if err != nil {
-				t.Fatalf("Couldn't create lock: %v", err)
+			switch objectType {
+			case rl.EndpointsLeasesResourceLock:
+				lock = &rl.MultiLock{
+					Primary: &rl.EndpointsLock{
+						EndpointsMeta: objectMeta,
+						LockConfig:    resourceLockConfig,
+						Client:        c.CoreV1(),
+					},
+					Secondary: &rl.LeaseLock{
+						LeaseMeta:  objectMeta,
+						LockConfig: resourceLockConfig,
+						Client:     c.CoordinationV1(),
+					},
+				}
+			case rl.ConfigMapsLeasesResourceLock:
+				lock = &rl.MultiLock{
+					Primary: &rl.ConfigMapLock{
+						ConfigMapMeta: objectMeta,
+						LockConfig:    resourceLockConfig,
+						Client:        c.CoreV1(),
+					},
+					Secondary: &rl.LeaseLock{
+						LeaseMeta:  objectMeta,
+						LockConfig: resourceLockConfig,
+						Client:     c.CoordinationV1(),
+					},
+				}
 			}

 			lec := LeaderElectionConfig{
@@ -937,14 +983,24 @@ func testReleaseLease(t *testing.T, objectType string) {
 			})

 			switch objectType {
+			case "endpoints":
+				lock = &rl.EndpointsLock{
+					EndpointsMeta: objectMeta,
+					LockConfig:    resourceLockConfig,
+					Client:        c.CoreV1(),
+				}
+			case "configmaps":
+				lock = &rl.ConfigMapLock{
+					ConfigMapMeta: objectMeta,
+					LockConfig:    resourceLockConfig,
+					Client:        c.CoreV1(),
+				}
 			case "leases":
 				lock = &rl.LeaseLock{
 					LeaseMeta:  objectMeta,
 					LockConfig: resourceLockConfig,
 					Client:     c.CoordinationV1(),
 				}
-			default:
-				t.Fatalf("Unknown objectType: %v", objectType)
 			}

 			lec := LeaderElectionConfig{
@@ -1002,11 +1058,29 @@ func testReleaseLease(t *testing.T, objectType string) {
 	}
 }

+// Will test leader election using endpoints as the resource
+func TestReleaseLeaseEndpoints(t *testing.T) {
+	testReleaseLease(t, "endpoints")
+}
+
+// Will test leader election using endpoints as the resource
+func TestReleaseLeaseConfigMaps(t *testing.T) {
+	testReleaseLease(t, "configmaps")
+}
+
 // Will test leader election using endpoints as the resource
 func TestReleaseLeaseLeases(t *testing.T) {
 	testReleaseLease(t, "leases")
 }

+func TestReleaseOnCancellation_Endpoints(t *testing.T) {
+	testReleaseOnCancellation(t, "endpoints")
+}
+
+func TestReleaseOnCancellation_ConfigMaps(t *testing.T) {
+	testReleaseOnCancellation(t, "configmaps")
+}
+
 func TestReleaseOnCancellation_Leases(t *testing.T) {
 	testReleaseOnCancellation(t, "leases")
 }
--- a/tools/leaderelection/resourcelock/configmaplock.go
+++ b/tools/leaderelection/resourcelock/configmaplock.go
@@ -32,7 +32,7 @@ import (
 // and use ConfigMaps as the means to pass that configuration
 // data we will likely move to deprecate the Endpoints lock.

-type configMapLock struct {
+type ConfigMapLock struct {
 	// ConfigMapMeta should contain a Name and a Namespace of a
 	// ConfigMapMeta object that the LeaderElector will attempt to lead.
 	ConfigMapMeta metav1.ObjectMeta
@@ -42,7 +42,7 @@ type configMapLock struct {
 }

 // Get returns the election record from a ConfigMap Annotation
-func (cml *configMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte, error) {
+func (cml *ConfigMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte, error) {
 	var record LeaderElectionRecord
 	var err error
 	cml.cm, err = cml.Client.ConfigMaps(cml.ConfigMapMeta.Namespace).Get(ctx, cml.ConfigMapMeta.Name, metav1.GetOptions{})
@@ -63,7 +63,7 @@ func (cml *configMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byt
 }

 // Create attempts to create a LeaderElectionRecord annotation
-func (cml *configMapLock) Create(ctx context.Context, ler LeaderElectionRecord) error {
+func (cml *ConfigMapLock) Create(ctx context.Context, ler LeaderElectionRecord) error {
 	recordBytes, err := json.Marshal(ler)
 	if err != nil {
 		return err
@@ -81,7 +81,7 @@ func (cml *configMapLock) Create(ctx context.Context, ler LeaderElectionRecord)
 }

 // Update will update an existing annotation on a given resource.
-func (cml *configMapLock) Update(ctx context.Context, ler LeaderElectionRecord) error {
+func (cml *ConfigMapLock) Update(ctx context.Context, ler LeaderElectionRecord) error {
 	if cml.cm == nil {
 		return errors.New("configmap not initialized, call get or create first")
 	}
@@ -102,7 +102,7 @@ func (cml *configMapLock) Update(ctx context.Context, ler LeaderElectionRecord)
 }

 // RecordEvent in leader election while adding meta-data
-func (cml *configMapLock) RecordEvent(s string) {
+func (cml *ConfigMapLock) RecordEvent(s string) {
 	if cml.LockConfig.EventRecorder == nil {
 		return
 	}
@@ -116,11 +116,11 @@ func (cml *configMapLock) RecordEvent(s string) {

 // Describe is used to convert details on current resource lock
 // into a string
-func (cml *configMapLock) Describe() string {
+func (cml *ConfigMapLock) Describe() string {
 	return fmt.Sprintf("%v/%v", cml.ConfigMapMeta.Namespace, cml.ConfigMapMeta.Name)
 }

 // Identity returns the Identity of the lock
-func (cml *configMapLock) Identity() string {
+func (cml *ConfigMapLock) Identity() string {
 	return cml.LockConfig.Identity
 }
--- a/tools/leaderelection/resourcelock/endpointslock.go
+++ b/tools/leaderelection/resourcelock/endpointslock.go
@@ -27,7 +27,7 @@ import (
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 )

-type endpointsLock struct {
+type EndpointsLock struct {
 	// EndpointsMeta should contain a Name and a Namespace of an
 	// Endpoints object that the LeaderElector will attempt to lead.
 	EndpointsMeta metav1.ObjectMeta
@@ -37,7 +37,7 @@ type endpointsLock struct {
 }

 // Get returns the election record from a Endpoints Annotation
-func (el *endpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte, error) {
+func (el *EndpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte, error) {
 	var record LeaderElectionRecord
 	var err error
 	el.e, err = el.Client.Endpoints(el.EndpointsMeta.Namespace).Get(ctx, el.EndpointsMeta.Name, metav1.GetOptions{})
@@ -58,7 +58,7 @@ func (el *endpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte
 }

 // Create attempts to create a LeaderElectionRecord annotation
-func (el *endpointsLock) Create(ctx context.Context, ler LeaderElectionRecord) error {
+func (el *EndpointsLock) Create(ctx context.Context, ler LeaderElectionRecord) error {
 	recordBytes, err := json.Marshal(ler)
 	if err != nil {
 		return err
@@ -76,7 +76,7 @@ func (el *endpointsLock) Create(ctx context.Context, ler LeaderElectionRecord) e
 }

 // Update will update and existing annotation on a given resource.
-func (el *endpointsLock) Update(ctx context.Context, ler LeaderElectionRecord) error {
+func (el *EndpointsLock) Update(ctx context.Context, ler LeaderElectionRecord) error {
 	if el.e == nil {
 		return errors.New("endpoint not initialized, call get or create first")
 	}
@@ -97,7 +97,7 @@ func (el *endpointsLock) Update(ctx context.Context, ler LeaderElectionRecord) e
 }

 // RecordEvent in leader election while adding meta-data
-func (el *endpointsLock) RecordEvent(s string) {
+func (el *EndpointsLock) RecordEvent(s string) {
 	if el.LockConfig.EventRecorder == nil {
 		return
 	}
@@ -111,11 +111,11 @@ func (el *endpointsLock) RecordEvent(s string) {

 // Describe is used to convert details on current resource lock
 // into a string
-func (el *endpointsLock) Describe() string {
+func (el *EndpointsLock) Describe() string {
 	return fmt.Sprintf("%v/%v", el.EndpointsMeta.Namespace, el.EndpointsMeta.Name)
 }

 // Identity returns the Identity of the lock
-func (el *endpointsLock) Identity() string {
+func (el *EndpointsLock) Identity() string {
 	return el.LockConfig.Identity
 }
--- a/tools/leaderelection/resourcelock/interface.go
+++ b/tools/leaderelection/resourcelock/interface.go
@@ -31,77 +31,11 @@ import (

 const (
 	LeaderElectionRecordAnnotationKey = "control-plane.alpha.kubernetes.io/leader"
-	endpointsResourceLock             = "endpoints"
-	configMapsResourceLock            = "configmaps"
+	EndpointsResourceLock             = "endpoints"
+	ConfigMapsResourceLock            = "configmaps"
 	LeasesResourceLock                = "leases"
-	// When using EndpointsLeasesResourceLock, you need to ensure that
-	// API Priority & Fairness is configured with non-default flow-schema
-	// that will catch the necessary operations on leader-election related
-	// endpoint objects.
-	//
-	// The example of such flow scheme could look like this:
-	//   apiVersion: flowcontrol.apiserver.k8s.io/v1beta2
-	//   kind: FlowSchema
-	//   metadata:
-	//     name: my-leader-election
-	//   spec:
-	//     distinguisherMethod:
-	//       type: ByUser
-	//     matchingPrecedence: 200
-	//     priorityLevelConfiguration:
-	//       name: leader-election   # reference the <leader-election> PL
-	//     rules:
-	//     - resourceRules:
-	//       - apiGroups:
-	//         - ""
-	//         namespaces:
-	//         - '*'
-	//         resources:
-	//         - endpoints
-	//         verbs:
-	//         - get
-	//         - create
-	//         - update
-	//       subjects:
-	//       - kind: ServiceAccount
-	//         serviceAccount:
-	//           name: '*'
-	//           namespace: kube-system
-	EndpointsLeasesResourceLock = "endpointsleases"
-	// When using EndpointsLeasesResourceLock, you need to ensure that
-	// API Priority & Fairness is configured with non-default flow-schema
-	// that will catch the necessary operations on leader-election related
-	// configmap objects.
-	//
-	// The example of such flow scheme could look like this:
-	//   apiVersion: flowcontrol.apiserver.k8s.io/v1beta2
-	//   kind: FlowSchema
-	//   metadata:
-	//     name: my-leader-election
-	//   spec:
-	//     distinguisherMethod:
-	//       type: ByUser
-	//     matchingPrecedence: 200
-	//     priorityLevelConfiguration:
-	//       name: leader-election   # reference the <leader-election> PL
-	//     rules:
-	//     - resourceRules:
-	//       - apiGroups:
-	//         - ""
-	//         namespaces:
-	//         - '*'
-	//         resources:
-	//         - configmaps
-	//         verbs:
-	//         - get
-	//         - create
-	//         - update
-	//       subjects:
-	//       - kind: ServiceAccount
-	//         serviceAccount:
-	//           name: '*'
-	//           namespace: kube-system
-	ConfigMapsLeasesResourceLock = "configmapsleases"
+	EndpointsLeasesResourceLock       = "endpointsleases"
+	ConfigMapsLeasesResourceLock      = "configmapsleases"
 )

 // LeaderElectionRecord is the record that is stored in the leader election annotation.
@@ -164,7 +98,7 @@ type Interface interface {

 // Manufacture will create a lock of a given type according to the input parameters
 func New(lockType string, ns string, name string, coreClient corev1.CoreV1Interface, coordinationClient coordinationv1.CoordinationV1Interface, rlc ResourceLockConfig) (Interface, error) {
-	endpointsLock := &endpointsLock{
+	endpointsLock := &EndpointsLock{
 		EndpointsMeta: metav1.ObjectMeta{
 			Namespace: ns,
 			Name:      name,
@@ -172,7 +106,7 @@ func New(lockType string, ns string, name string, coreClient corev1.CoreV1Interf
 		Client:     coreClient,
 		LockConfig: rlc,
 	}
-	configmapLock := &configMapLock{
+	configmapLock := &ConfigMapLock{
 		ConfigMapMeta: metav1.ObjectMeta{
 			Namespace: ns,
 			Name:      name,
@@ -189,10 +123,10 @@ func New(lockType string, ns string, name string, coreClient corev1.CoreV1Interf
 		LockConfig: rlc,
 	}
 	switch lockType {
-	case endpointsResourceLock:
-		return nil, fmt.Errorf("endpoints lock is removed, migrate to %s", EndpointsLeasesResourceLock)
-	case configMapsResourceLock:
-		return nil, fmt.Errorf("configmaps lock is removed, migrate to %s", ConfigMapsLeasesResourceLock)
+	case EndpointsResourceLock:
+		return endpointsLock, nil
+	case ConfigMapsResourceLock:
+		return configmapLock, nil
 	case LeasesResourceLock:
 		return leaseLock, nil
 	case EndpointsLeasesResourceLock:
--- a/tools/metrics/OWNERS
+++ b/tools/metrics/OWNERS
@@ -1,5 +1,6 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 reviewers:
-  - wojtek-t
-  - jayunit100
+- wojtek-t
+- krousey
+- jayunit100
--- a/tools/record/OWNERS
+++ b/tools/record/OWNERS
@@ -1,6 +1,6 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 reviewers:
-  - sig-instrumentation-reviewers
+- sig-instrumentation-reviewers
 approvers:
-  - sig-instrumentation-approvers
+- sig-instrumentation-approvers
--- a/tools/record/event_test.go
+++ b/tools/record/event_test.go
@@ -129,6 +129,7 @@ func TestNonRacyShutdown(t *testing.T) {
 func TestEventf(t *testing.T) {
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "bar",
@@ -136,6 +137,7 @@ func TestEventf(t *testing.T) {
 	}
 	testPod2 := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "differentUid",
@@ -552,8 +554,9 @@ func TestLotsOfEvents(t *testing.T) {
 func TestEventfNoNamespace(t *testing.T) {
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "foo",
-			UID:  "bar",
+			SelfLink: "/api/v1/namespaces/default/pods/foo",
+			Name:     "foo",
+			UID:      "bar",
 		},
 	}
 	testRef, err := ref.GetPartialReference(scheme.Scheme, testPod, "spec.containers[2]")
@@ -648,6 +651,7 @@ func TestEventfNoNamespace(t *testing.T) {
 func TestMultiSinkCache(t *testing.T) {
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "bar",
@@ -655,6 +659,7 @@ func TestMultiSinkCache(t *testing.T) {
 	}
 	testPod2 := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
+			SelfLink:  "/api/v1/namespaces/baz/pods/foo",
 			Name:      "foo",
 			Namespace: "baz",
 			UID:       "differentUid",
--- a/tools/reference/ref_test.go
+++ b/tools/reference/ref_test.go
@@ -43,7 +43,7 @@ func TestGetReferenceRefVersion(t *testing.T) {
 		{
 			name: "v1 GV from scheme",
 			input: &TestRuntimeObj{
-				ObjectMeta: metav1.ObjectMeta{},
+				ObjectMeta: metav1.ObjectMeta{SelfLink: "/bad-selflink/unused"},
 			},
 			groupVersion:       schema.GroupVersion{Group: "", Version: "v1"},
 			expectedRefVersion: "v1",
@@ -51,7 +51,7 @@ func TestGetReferenceRefVersion(t *testing.T) {
 		{
 			name: "foo.group/v3 GV from scheme",
 			input: &TestRuntimeObj{
-				ObjectMeta: metav1.ObjectMeta{},
+				ObjectMeta: metav1.ObjectMeta{SelfLink: "/bad-selflink/unused"},
 			},
 			groupVersion:       schema.GroupVersion{Group: "foo.group", Version: "v3"},
 			expectedRefVersion: "foo.group/v3",
--- a/tools/watch/retrywatcher.go
+++ b/tools/watch/retrywatcher.go
@@ -268,13 +268,7 @@ func (rw *RetryWatcher) receive() {
 			return
 		}

-		timer := time.NewTimer(retryAfter)
-		select {
-		case <-ctx.Done():
-			timer.Stop()
-			return
-		case <-timer.C:
-		}
+		time.Sleep(retryAfter)

 		klog.V(4).Infof("Restarting RetryWatcher at RV=%q", rw.lastResourceVersion)
 	}, rw.minRestartDelay)
--- a/transport/OWNERS
+++ b/transport/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 reviewers:
-  - smarterclayton
-  - wojtek-t
-  - deads2k
-  - liggitt
-  - caesarxuchao
+- smarterclayton
+- wojtek-t
+- deads2k
+- liggitt
+- krousey
+- caesarxuchao
--- a/util/cert/OWNERS
+++ b/util/cert/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-certificates-approvers
+- sig-auth-certificates-approvers
 reviewers:
-  - sig-auth-certificates-reviewers
+- sig-auth-certificates-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/util/certificate/OWNERS
+++ b/util/certificate/OWNERS
@@ -1,8 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 approvers:
-  - sig-auth-certificates-approvers
+- sig-auth-certificates-approvers
 reviewers:
-  - sig-auth-certificates-reviewers
+- sig-auth-certificates-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/util/jsonpath/jsonpath_test.go
+++ b/util/jsonpath/jsonpath_test.go
@@ -793,7 +793,8 @@ func TestRunningPodsJSONPathOutput(t *testing.T) {
 				}
 			},
           		{
-				"resourceVersion": ""
+				"resourceVersion": "",
+				"selfLink": ""
 			}
 		]
 	}`)
--- a/util/keyutil/OWNERS
+++ b/util/keyutil/OWNERS
@@ -1,6 +1,7 @@
 approvers:
-  - sig-auth-certificates-approvers
+- sig-auth-certificates-approvers
 reviewers:
-  - sig-auth-certificates-reviewers
+- sig-auth-certificates-reviewers
 labels:
-  - sig/auth
+- sig/auth
+
--- a/util/retry/OWNERS
+++ b/util/retry/OWNERS
@@ -1,4 +1,4 @@
 # See the OWNERS docs at https://go.k8s.io/owners

 reviewers:
-  - caesarxuchao
+- caesarxuchao
--- a/util/workqueue/delaying_queue.go
+++ b/util/workqueue/delaying_queue.go
@@ -33,9 +33,7 @@ type DelayingInterface interface {
 	AddAfter(item interface{}, duration time.Duration)
 }

-// NewDelayingQueue constructs a new workqueue with delayed queuing ability.
-// NewDelayingQueue does not emit metrics. For use with a MetricsProvider, please use
-// NewNamedDelayingQueue instead.
+// NewDelayingQueue constructs a new workqueue with delayed queuing ability
 func NewDelayingQueue() DelayingInterface {
 	return NewDelayingQueueWithCustomClock(clock.RealClock{}, "")
 }
--- a/util/workqueue/rate_limiting_queue.go
+++ b/util/workqueue/rate_limiting_queue.go
@@ -34,8 +34,6 @@ type RateLimitingInterface interface {

 // NewRateLimitingQueue constructs a new workqueue with rateLimited queuing ability
 // Remember to call Forget!  If you don't, you may end up tracking failures forever.
-// NewRateLimitingQueue does not emit metrics. For use with a MetricsProvider, please use
-// NewNamedRateLimitingQueue instead.
 func NewRateLimitingQueue(rateLimiter RateLimiter) RateLimitingInterface {
 	return &rateLimitingType{
 		DelayingInterface: NewDelayingQueue(),
Author	SHA1	Message	Date
Kubernetes Publisher	c096072e38	Update dependencies to v0.23.2 tag	2022-01-19 21:45:06 +00:00
Kubernetes Publisher	857d6f1290	Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03	2022-01-15 05:54:30 +00:00
Jiahui Feng	94fb0d02e4	generated: ./hack/update-vendor.sh Kubernetes-commit: 89d8be52ef47c6a5d000a515b41f05567378a97b	2022-01-14 10:58:50 -08:00
Jiahui Feng	f739adfab1	upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 04f3c5793c1bc56014aeea93a3b4fefeb84b4e07	2022-01-14 10:30:23 -08:00
Kubernetes Publisher	3074be12fe	Merge pull request #107334 from fasaxc/automated-cherry-pick-of-#107311-upstream-release-1.23 Automated cherry pick of #107311: client-go: Clear the ResourceVersionMatch on paged list calls Kubernetes-commit: fa546d8cc76fe7c07c538d55efd2e6dd4ec919a5	2022-01-06 13:41:15 +00:00
Shaun Crampton	8ae6aa22f3	client-go: Clear the ResourceVersionMatch on paged list calls API server rejects continuations with ResourceVersionMatch set. Kubernetes-commit: cc6c36f286d59187902b0f9b6e15f80b824acc7c	2022-01-04 16:05:32 +00:00
Kubernetes Publisher	72a8f7483f	Merge pull request #106835 from cpanato/go117-release-1-23 [go1.17] Update to go1.17.5 and golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Kubernetes-commit: 08ad4f287316f941988fe1e1b8f425cded157048	2021-12-13 21:44:50 +00:00
Carlos Panato	d333414f84	dependencies: Update golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Signed-off-by: Carlos Panato <ctadeu@gmail.com> Kubernetes-commit: d065f7ffe77b46642f4f0802c0ad700b9d88d0ec	2021-12-10 17:39:02 +01:00
Kubernetes Publisher	c752eaaf05	Merge pull request #106782 from palnabarun/automated-cherry-pick-of-#106716-upstream-release-1.23 Automated cherry pick of #106716: bump TestHTTP1DoNotReuseRequestAfterTimeout timeout Kubernetes-commit: a3fc39c3e3c43a32c9047d91b005bbc5c4b77229	2021-12-04 05:04:13 +00:00
Kubernetes Publisher	17bbf03b1c	Merge pull request #106776 from SergeyKanzhelev/grpcFieldNameCharryPick Grpc field name cherry pick: 1.23 Kubernetes-commit: 93fb324dce69cdb2b5982058b167a45b2a51979d	2021-12-03 09:20:23 +00:00
Sergey Kanzhelev	1d1035d4c3	regenerated files Kubernetes-commit: 8e4834f3bcdfff805aa1a4dc422acffa779d9cbd	2021-12-02 04:44:46 +00:00
Kubernetes Publisher	f3c25ef2e8	Merge pull request #106661 from liggitt/automated-cherry-pick-of-#106660-upstream-release-1.23 Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb	2021-12-03 09:20:21 +00:00
Antonio Ojea	0d944767ec	bump TestHTTP1DoNotReuseRequestAfterTimeout timeout the test TestHTTP1DoNotReuseRequestAfterTimeout has to wait for request to time out to assert that subsequent requests does not reuse the TCP connection. It seems that current value of 100ms causes issues on some CI environments and bumping the timeout seems to solve this flakiness, We can bump the timeout value because is really low compared to real scenarios and the bump still keeps it in the millisecond order. Kubernetes-commit: fa68e8248594e54cda4cc06ab69030f6267ebbb7	2021-11-29 15:37:31 +01:00
Jordan Liggitt	3f1288c57f	Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: d148bbcee39e3c290f9d5663e848a398d402152d	2021-11-24 10:32:24 -05:00