Merge pull request #112161 from pohly/automated-cherry-pick-of-#112129-origin-release-1.25

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

Kubernetes-commit: 325e65b5d13e37b384bdd08397381a48693013d7
This commit is contained in:
Kubernetes Publisher 2022-09-09 01:33:22 -07:00
parent 69c9cb4a26
commit 73a73b65d6
2 changed files with 21 additions and 13 deletions

25
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7
k8s.io/cloud-provider v0.0.0-20220909123057-861aea5f171d
k8s.io/controller-manager v0.0.0-20220909122711-5350e785b6c5
)
require (
@ -21,7 +21,7 @@ require (
golang.org/x/text v0.3.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0 // indirect
k8s.io/component-base v0.0.0-20220909112026-91e1a995ab0d // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
@ -29,13 +29,12 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20220909104543-fce3016c0f35
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220909103826-10b456c523c7
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220909113852-bdbf5341a8de
k8s.io/client-go => k8s.io/client-go v0.0.0-20220909111216-1904631ef0be
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220909123057-861aea5f171d
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/controller-manager => k8s.io/controller-manager v0.0.0-20220909122711-5350e785b6c5
)

9
go.sum
View File

@ -68,6 +68,15 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
k8s.io/api v0.0.0-20220909104543-fce3016c0f35 h1:u8CuY5/HNkUPwechzT9y48BarB4yAtn/meKrJn5j+38=
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/cloud-provider v0.0.0-20220909123057-861aea5f171d h1:sxTOidBUFGxI0zmUR/iKiSWXk+rtgeozI1bDzvZkZWw=
k8s.io/cloud-provider v0.0.0-20220909123057-861aea5f171d/go.mod h1:VzPnYeE6VvNbkmBclewWEBWfTe7N7BhpqmPuW1/yPjw=
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/controller-manager v0.0.0-20220909122711-5350e785b6c5 h1:bfgHHvLTEnUQZRau3cHqtnCGcNXzhsPaKOCjkhM4xmA=
k8s.io/controller-manager v0.0.0-20220909122711-5350e785b6c5/go.mod h1:/eprwjc8lHngGwNdISoMrwSWdskZzlRt2GkOeaDJQrw=
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=