Merge pull request #103320 from jpbetz/fix-102749-1.20

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

Kubernetes-commit: 86c8e960eeabd346a92457973d41abd865eccb5f

go.mod

@@ -34,28 +34,27 @@ require (
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/cli-runtime v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/component-base v0.0.0
-	k8s.io/component-helpers v0.0.0
+	k8s.io/api v0.0.0-20210712061735-c542627fda65
+	k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
+	k8s.io/cli-runtime v0.0.0-20210712073852-dcf16831d0af
+	k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
+	k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22
+	k8s.io/component-helpers v0.0.0-20210712064923-e7a78b701ce4
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
-	k8s.io/metrics v0.0.0
+	k8s.io/metrics v0.0.0-20210712073416-cbf3b5c760c9
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/kustomize v2.0.3+incompatible
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/cli-runtime => ../cli-runtime
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/component-base => ../component-base
-	k8s.io/component-helpers => ../component-helpers
-	k8s.io/kubectl => ../kubectl
-	k8s.io/metrics => ../metrics
+	k8s.io/api => k8s.io/api v0.0.0-20210712061735-c542627fda65
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210712073852-dcf16831d0af
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22
+	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210712064923-e7a78b701ce4
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20210712073416-cbf3b5c760c9
 )

go.sum

@@ -625,6 +625,19 @@ 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-20210712061735-c542627fda65 h1:hNU7BYfSkjgg4e6RiDnAcmCB0oowEB4KNUuAAYczqZQ=
+k8s.io/api v0.0.0-20210712061735-c542627fda65/go.mod h1:46MConCeKv5gXizJs2U/jhw5xCH0WBWbqGc5j5fAnaM=
+k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 h1:rz55eMOF7F/F4281jjtEB75DcQXeCPgjrNJPfcH9Yzc=
+k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
+k8s.io/cli-runtime v0.0.0-20210712073852-dcf16831d0af h1:bIBSVnFszfphAuQXS4V+PbcWk2v2O/GkDNDTJ1TUW74=
+k8s.io/cli-runtime v0.0.0-20210712073852-dcf16831d0af/go.mod h1:pq2/e9ftKd+GlnV5EQO3Nu8xf07i3Hdx9T7Nyozc5Mo=
+k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a h1:Wuy6E3SVMtz9XMj0S3sBQFTsFMlB4nzydZ9S3shpJLs=
+k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a/go.mod h1:Yxt2oTRRTtVUH3dLHRdYyl/dMP83rJyeSw3U4ktSkc0=
+k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3/go.mod h1:i6FmG+QxaLxvJsezvZp0q/gAEzzOz3U53KFibghWToU=
+k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22 h1:UGpIEjQ1Ng49Dr2d7ks5cP/VgX9WteIEvvSuT7Uf6T0=
+k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22/go.mod h1:qcPTmKgs9wUVYSofT018hFmsYSUUmEVdIGePJMcspPM=
+k8s.io/component-helpers v0.0.0-20210712064923-e7a78b701ce4 h1:K+70eyBrZjWCYJChm/Gr66WoRmyIK2eEG8nhGcB8QdY=
+k8s.io/component-helpers v0.0.0-20210712064923-e7a78b701ce4/go.mod h1:vc2bBpvRpQW0HVqdijE/V39KEJWDeLIN/hno/kJOkmg=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -633,6 +646,8 @@ k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
+k8s.io/metrics v0.0.0-20210712073416-cbf3b5c760c9 h1:LrIkC8IEjvX5F+EQPL/J1gqwde3StXx9l7ewfvOHi9I=
+k8s.io/metrics v0.0.0-20210712073416-cbf3b5c760c9/go.mod h1:rxgCGTdgQE2DY0l3E/AUAoUzAOJffKm2yrqegnvDlqU=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=