Merge pull request #112161 from pohly/automated-cherry-pick-of-#11212…

…9-origin-release-1.25

Automated cherry pick of #112129: dependencies: update to ginkgo v2.1.6 and gomega v1.20.1

Kubernetes-commit: 325e65b5d13e37b384bdd08397381a48693013d7

go.mod

@@ -14,30 +14,30 @@ require (
 	github.com/fatih/camelcase v1.0.0
 	github.com/fvbommel/sortorder v1.0.1
 	github.com/google/gnostic v0.5.7-v3refs
-	github.com/google/go-cmp v0.5.6
+	github.com/google/go-cmp v0.5.8
 	github.com/jonboulle/clockwork v0.2.2
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
 	github.com/lithammer/dedent v1.1.0
 	github.com/mitchellh/go-wordwrap v1.0.0
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
-	github.com/onsi/ginkgo/v2 v2.1.4
-	github.com/onsi/gomega v1.19.0
+	github.com/onsi/ginkgo/v2 v2.1.6
+	github.com/onsi/gomega v1.20.1
 	github.com/pkg/errors v0.9.1
 	github.com/russross/blackfriday v1.5.2
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20220810012946-5c4a1b197d1d
-	k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3
-	k8s.io/cli-runtime v0.0.0-20220810191336-a7c40597df6d
-	k8s.io/client-go v0.0.0-20220818224544-b3e4a4065aa2
-	k8s.io/component-base v0.0.0-20220810184732-a3ff0a6aeab5
-	k8s.io/component-helpers v0.0.0-20220810184904-28f37af09947
+	k8s.io/api v0.0.0-20220909104543-fce3016c0f35
+	k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7
+	k8s.io/cli-runtime v0.0.0-20220909121041-0c43086eec9e
+	k8s.io/client-go v0.0.0-20220909111216-1904631ef0be
+	k8s.io/component-base v0.0.0-20220909112026-91e1a995ab0d
+	k8s.io/component-helpers v0.0.0-20220909112314-b757bb659f7a
 	k8s.io/klog/v2 v2.70.1
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
-	k8s.io/metrics v0.0.0-20220810191141-ffc1ec435f51
+	k8s.io/metrics v0.0.0-20220909120653-f876fde60a8d
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
 	sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@@ -84,7 +84,6 @@ require (
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
@@ -94,12 +93,12 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220810012946-5c4a1b197d1d
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220810191336-a7c40597df6d
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20220818224544-b3e4a4065aa2
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220818194126-775c3046a7d3
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20220810184732-a3ff0a6aeab5
-	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220810184904-28f37af09947
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20220810191141-ffc1ec435f51
+	k8s.io/api => k8s.io/api v0.0.0-20220909104543-fce3016c0f35
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220909121041-0c43086eec9e
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220909111216-1904631ef0be
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220909103155-7e9837e6180a
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20220909112026-91e1a995ab0d
+	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220909112314-b757bb659f7a
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20220909120653-f876fde60a8d
 )

go.sum

@@ -142,8 +142,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -216,10 +216,10 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
-github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
-github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
+github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
+github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
+github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
+github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
@@ -434,7 +434,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -541,25 +540,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.0.0-20220810012946-5c4a1b197d1d h1:F9Y90rBZKxF1UdLpYARRc6ZW+7kHMZ3980oLqGwNfak=
-k8s.io/api v0.0.0-20220810012946-5c4a1b197d1d/go.mod h1:cuE2+aKfcxEMeHx/NuUKIL3aRJhth7/K9wlCf+3Q3+s=
-k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 h1:Ru2oqar5qMV68dM0G6OEZs2C7qtydpReZ2dHsXpu/Kw=
-k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0=
-k8s.io/cli-runtime v0.0.0-20220810191336-a7c40597df6d h1:IRToqMteYht2e5RnZkx8ZlhFNcsW1hixmQEbOS2J5iw=
-k8s.io/cli-runtime v0.0.0-20220810191336-a7c40597df6d/go.mod h1:Tvpth9pLpTuGtIJRXkHyiRV1aySWB4fkzO/eISsDbk4=
-k8s.io/client-go v0.0.0-20220818224544-b3e4a4065aa2 h1:2BTIo2+tUuhR+yTyoBAE1m61P9qzy+AzbzTUAzBeHas=
-k8s.io/client-go v0.0.0-20220818224544-b3e4a4065aa2/go.mod h1:mv6y8YO6LAjJJj5+budLu55CP8Q3Iu0eFDqrlPN06/I=
-k8s.io/component-base v0.0.0-20220810184732-a3ff0a6aeab5 h1:qw7krbnZuTUZssW4V4V4h+pvLsnWNz5ZhfglrEIoNLI=
-k8s.io/component-base v0.0.0-20220810184732-a3ff0a6aeab5/go.mod h1:ij1d8OKrbGbeL3b7tnrEKOuN2itnGAl4CSinffjTRko=
-k8s.io/component-helpers v0.0.0-20220810184904-28f37af09947 h1:J91pDxCYAqAoTdjg6LuzFa3MXin/ZEpwapp/bVOidPU=
-k8s.io/component-helpers v0.0.0-20220810184904-28f37af09947/go.mod h1:R0VxXCZmw73I91z817R+rKB5TQlMrxnMWvexBnhZmIE=
+k8s.io/api v0.0.0-20220909104543-fce3016c0f35 h1:u8CuY5/HNkUPwechzT9y48BarB4yAtn/meKrJn5j+38=
+k8s.io/api v0.0.0-20220909104543-fce3016c0f35/go.mod h1:FeqpcvGi6C+D7XYd+eThTUHnFpNx4enpIdClTz7Ww5Q=
+k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7 h1:kRQIdYUKC7FP4M4xmU03qFA+BVcX8BVFZDiyIZ2wCuI=
+k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA=
+k8s.io/cli-runtime v0.0.0-20220909121041-0c43086eec9e h1:cNdbAyamZRodxKu3vnc1OU1ZFrQV5WbYjnMyA2jnxFg=
+k8s.io/cli-runtime v0.0.0-20220909121041-0c43086eec9e/go.mod h1:MGFFGlkMRCopybIUPSd6XQSBF9O1tRT+oeweb9Ix0kY=
+k8s.io/client-go v0.0.0-20220909111216-1904631ef0be h1:Y37qp+R07IEev2uhEGROFqJDCFg9JCi86OFbIXO+dR0=
+k8s.io/client-go v0.0.0-20220909111216-1904631ef0be/go.mod h1:40Ywwcf7Yaln9CHRk1CWNoTZM/o/bSsVnz+7Ul4we2g=
+k8s.io/component-base v0.0.0-20220909112026-91e1a995ab0d h1:PWgNy1lDGyrH2AEegy07Xyb6flXbwCUyKBH3pqa54+k=
+k8s.io/component-base v0.0.0-20220909112026-91e1a995ab0d/go.mod h1:RTbL9oh4q7tln6HVeMmH6fwU0/v2lFTt/skRMBrCHzs=
+k8s.io/component-helpers v0.0.0-20220909112314-b757bb659f7a h1:1BW1c/LZGUoZvpV5mKOsJKVKOvr2x3sgU3eN+6SoRqc=
+k8s.io/component-helpers v0.0.0-20220909112314-b757bb659f7a/go.mod h1:zQH4FGSgQjk+X5akPIpFMIKuF8oeipzwzIZIK831YjI=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
-k8s.io/metrics v0.0.0-20220810191141-ffc1ec435f51 h1:eLBee5nezvmPnT3ErJ5tCpKmFuDTdNR7I+nEAnxA1b8=
-k8s.io/metrics v0.0.0-20220810191141-ffc1ec435f51/go.mod h1:OZtyc11+TayJnMu7L/Cd8dDrxPdrXJ6Ef5gTDy0VWQg=
+k8s.io/metrics v0.0.0-20220909120653-f876fde60a8d h1:FqOWTW3njtI/uETg4W0dNlUIQfGIFtzNZ/ev2C+Jr7k=
+k8s.io/metrics v0.0.0-20220909120653-f876fde60a8d/go.mod h1:W5oWsZ4eWkb+f2c3abJOKsu933o6E04eN+To+jR8qzw=
 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=