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

k8s-publishing-bot · k8s-publishing-bot · commit 7e9837e6180a · 2022-09-09T10:31:55.000Z
Automated cherry pick of #112129: dependencies: update to ginkgo v2.1.6 and gomega v1.20.1

Kubernetes-commit: 325e65b5d13e37b384bdd08397381a48693013d7
diff --git a/go.mod b/go.mod
@@ -42,5 +42,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
-
-replace k8s.io/code-generator => ../code-generator

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,3 @@ require (`
`42`	`42`	`sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect`
`43`	`43`	`sigs.k8s.io/yaml v1.2.0 // indirect`
`44`	`44`	`)`
`45`		`-`
`46`		`-replace k8s.io/code-generator => ../code-generator`