Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23

k8s-publishing-bot · k8s-publishing-bot · commit 293ba3b8da1f · 2022-01-15T05:18:11.000Z
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03
diff --git a/go.mod b/go.mod
@@ -24,5 +24,3 @@ require (
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )
-
-replace k8s.io/code-generator => ../code-generator

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,3 @@ require (`
`24`	`24`	`k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65`
`25`	`25`	`sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect`
`26`	`26`	`)`
`27`		`-`
`28`		`-replace k8s.io/code-generator => ../code-generator`