Merge pull request #103319 from jpbetz/fix-102749-1.21

Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix

Kubernetes-commit: c17d7c574149af1619dc8edd9c48a41dc07695e8

go.mod

@@ -18,12 +18,12 @@ require (
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
 	google.golang.org/grpc v1.27.1
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/apiserver v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/code-generator v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/api v0.0.0-20210712061851-e7183502f6db
+	k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8
+	k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f
+	k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e
+	k8s.io/code-generator v0.0.0-20210712060516-25a36f50304a
+	k8s.io/component-base v0.0.0-20210712064623-3889627966a2
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
@@ -32,11 +32,10 @@ require (
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/component-base => ../component-base
+	k8s.io/api => k8s.io/api v0.0.0-20210712061851-e7183502f6db
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210712060516-25a36f50304a
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064623-3889627966a2
 )

go.sum

@@ -673,6 +673,18 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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=
+k8s.io/api v0.0.0-20210712061851-e7183502f6db h1:24QxDYhEfdh+XCGIhv16ciVMeE/xE9fOh71LE/YlCTc=
+k8s.io/api v0.0.0-20210712061851-e7183502f6db/go.mod h1:/+YgqSJs7JFYq7KD73gQIBmg22nIhE35kwb2jhrVYnA=
+k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8 h1:1OmwvcyF2eOmfatOSyhLzDgk+oq+TuO7w0iQIQA53AY=
+k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI=
+k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f h1:xOhOMGszC6YvZC5Ky7HHVNBMf9P27tbG3OHimoCPHyY=
+k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f/go.mod h1:7wCuJu4Nr8wuXjMvWtQGikJic9G0qWAmd53GMg5SECU=
+k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e h1:35nYFV8VOJK0WLTDBGyybmaMH3ZG1KekbPRCgrEoSf4=
+k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e/go.mod h1:deZddpbEnssEoTj+691wut0R5QED4V7yW9lad1s/VU8=
+k8s.io/code-generator v0.0.0-20210712060516-25a36f50304a h1:73GQ+tZvui6LypmFjyN/pnsy23YgtHYylugGgmM1+/k=
+k8s.io/code-generator v0.0.0-20210712060516-25a36f50304a/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo=
+k8s.io/component-base v0.0.0-20210712064623-3889627966a2 h1:mwTR65Fu3Oq3hcHiecu3boHEO8IRtbCHXUctJsRdpnE=
+k8s.io/component-base v0.0.0-20210712064623-3889627966a2/go.mod h1:9U5+ZgrnmsBuUQUXzkhT1mYyLLqakRRJBCIeFZ5r6rI=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=