upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

jiahuif · k8s-publishing-bot · commit 71825019e241 · 2022-01-14T10:30:23.000-08:00
Kubernetes-commit: 04f3c5793c1bc56014aeea93a3b4fefeb84b4e07
diff --git a/go.mod b/go.mod
@@ -22,5 +22,7 @@ require (
 	k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c
 	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	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
`@@ -22,5 +22,7 @@ require (`
`22`	`22`	`k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c`
`23`	`23`	`k8s.io/klog/v2 v2.30.0`
`24`	`24`	`k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65`
`25`		`- sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect`
	`25`	`+ sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect`
`26`	`26`	`)`
	`27`	`+`
	`28`	`+replace k8s.io/code-generator => ../code-generator`