Merge pull request #109216 from wojtek-t/automated-cherry-pick-of-#10…

…9188-upstream-release-1.23

Automated cherry pick of #109188 upstream release 1.23

Kubernetes-commit: eaf200eb89b359039cc497c7b99ddcbd6ee780a7

go.mod

@@ -43,9 +43,9 @@ require (
 	google.golang.org/grpc v1.40.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/square/go-jose.v2 v2.2.2
-	k8s.io/api v0.0.0-20220222194917-a6b22073a6bd
+	k8s.io/api v0.0.0-20220331200636-27e5860b52b6
 	k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3
-	k8s.io/client-go v0.0.0-20220124173639-0f7ee7041f40
+	k8s.io/client-go v0.0.0-20220331091936-a475c2871397
 	k8s.io/component-base v0.0.0-20220124174242-95a6431a4277
 	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
@@ -57,8 +57,8 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220222194917-a6b22073a6bd
+	k8s.io/api => k8s.io/api v0.0.0-20220331200636-27e5860b52b6
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20220124173639-0f7ee7041f40
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220331091936-a475c2871397
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20220124174242-95a6431a4277
 )

go.sum

@@ -953,12 +953,12 @@ 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.0.0-20220222194917-a6b22073a6bd h1:zkhSmvtAvkp9uWoM0Djrk9GsNCcXsxZiTUXbwte8eMg=
-k8s.io/api v0.0.0-20220222194917-a6b22073a6bd/go.mod h1:9Vo9KEQyesRPDP6eG+jDkliZvSar3OLe8f5zfqiRoec=
+k8s.io/api v0.0.0-20220331200636-27e5860b52b6 h1:4dgxatAVTPABorofxL+Z3U2MLAIA8NTrgecUAnCao6w=
+k8s.io/api v0.0.0-20220331200636-27e5860b52b6/go.mod h1:9Vo9KEQyesRPDP6eG+jDkliZvSar3OLe8f5zfqiRoec=
 k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3 h1:n2y4Rh6ixZSeru9imTOu4bYNuAObzwMBnUcPVFzaXnk=
 k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
-k8s.io/client-go v0.0.0-20220124173639-0f7ee7041f40 h1:uhKRuDFRb5ae1CDGmUH4CjvX1UtSRO+OH66V9RPWFtQ=
-k8s.io/client-go v0.0.0-20220124173639-0f7ee7041f40/go.mod h1:eX6IRvbE8ZpWoV2CXdEGqTFTQGcI+Rm6m9bBI1d3Ys0=
+k8s.io/client-go v0.0.0-20220331091936-a475c2871397 h1:KHcjgM1J5cgsmSveyTnidOIqFOvOODkYiDdLE3UyuuI=
+k8s.io/client-go v0.0.0-20220331091936-a475c2871397/go.mod h1:izfSZIwqe/CwZnRIQtvTWezLZwfLeQWRD/cILSHRixw=
 k8s.io/component-base v0.0.0-20220124174242-95a6431a4277 h1:Avm1ar/AB4Hi8+FABiWTYGZFfD0pwMEkHv244Ar1j6k=
 k8s.io/component-base v0.0.0-20220124174242-95a6431a4277/go.mod h1:liKXZIJJu+NNA3mVaYnMGyRsDxyEQ6ItKPqX/YWLVxA=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=