Merge pull request #106661 from liggitt/automated-cherry-pick-of-#106…

…660-upstream-release-1.23

Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb

go.mod

@@ -30,8 +30,8 @@ require (
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	google.golang.org/protobuf v1.27.1
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20211203090506-2893881082f7
+	k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
 	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@@ -40,7 +40,6 @@ require (
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.0.0-20211203090506-2893881082f7
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
 )

go.sum

@@ -610,6 +610,10 @@ 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-20211203090506-2893881082f7 h1:uOyVSOPIZ3n17DT7fbpRIWa8tnwXcq81Q6Ri7ITzYsA=
+k8s.io/api v0.0.0-20211203090506-2893881082f7/go.mod h1:sSZUBf47O72sm2TBpsmNK7PMBvL3qWQRzlPt0Uly0Q0=
+k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2 h1:KQpp3OaTtqoEEgfEX55D5+FQ5aqOb1/YcDoY5eCsAbU=
+k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=