Merge pull request #101177 from KnVerey/automated-cherry-pick-of-#101…

…120-upstream-release-1.21

Automated cherry pick of #101120: Upgrade kustomize-in-kubectl to v4.1.2

Kubernetes-commit: eea689f5c6915bc0a4d64075d34ed1c5c65f2bb2

go.mod

@@ -33,29 +33,28 @@ require (
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
 	gopkg.in/yaml.v2 v2.4.0
-	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-20210329112114-1f635bfa4973
+	k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6
+	k8s.io/cli-runtime v0.0.0-20210419121406-10ad15c2ef66
+	k8s.io/client-go v0.0.0-20210401152202-307e3a38a167
+	k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd
+	k8s.io/component-helpers v0.0.0-20210329113305-9d0176ad0d22
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
-	k8s.io/metrics v0.0.0
+	k8s.io/metrics v0.0.0-20210329115205-064a2af7ea58
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/kustomize/api v0.8.8
 	sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
 	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-20210329112114-1f635bfa4973
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210419121406-10ad15c2ef66
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210401152202-307e3a38a167
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329111516-cb1b268548af
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd
+	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210329113305-9d0176ad0d22
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20210329115205-064a2af7ea58
 )

go.sum

@@ -721,6 +721,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-20210329112114-1f635bfa4973 h1:lpbSfpknIINyTQKly4k/FjqxmODVfgQHgmVCqbL/1qA=
+k8s.io/api v0.0.0-20210329112114-1f635bfa4973/go.mod h1:bbunxWRHC0NymRWrp/wsI0V/Zs/w4UBMliggHDfC1xw=
+k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6 h1:rF9UWPFMeCzTx61QJd1PO4vZmpe8eNmJRuFGfZBG1r4=
+k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
+k8s.io/cli-runtime v0.0.0-20210419121406-10ad15c2ef66 h1:pezXtCnvVWRihNnMitX5I5ILQq6juuQHqY/bXcr+MqQ=
+k8s.io/cli-runtime v0.0.0-20210419121406-10ad15c2ef66/go.mod h1:0IYeHJ+4BAaSOVRz/Kd+MnWKfS0ewTBusEQXhW+mKR0=
+k8s.io/client-go v0.0.0-20210401152202-307e3a38a167 h1:6dfdaZ0/RfxMbyUuuKL4xdk4+DVjkO76nmb6z4S+bn0=
+k8s.io/client-go v0.0.0-20210401152202-307e3a38a167/go.mod h1:0NnunnaJsArENJKmzcOD5u2QcfS7Nf3fIzcyhNQI5GI=
+k8s.io/code-generator v0.0.0-20210329111516-cb1b268548af/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
+k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd h1:PuPyv7L2fj1h4jyFAgFMhRgGZgoR3yqTuiVNGzskEW0=
+k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd/go.mod h1:IEys5YfGZC2nKiSTFY0147SzFCqtO/jiMVVCR8FcTKQ=
+k8s.io/component-helpers v0.0.0-20210329113305-9d0176ad0d22 h1:POmqzndFE1JYPfmGbSz3wpfOQ0i+6wh07OK6q4Yp6ys=
+k8s.io/component-helpers v0.0.0-20210329113305-9d0176ad0d22/go.mod h1:tt98IZCEEyFYJ1cCl9/cVRz6pO1WuXujhOAVsoU/1g0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -729,6 +742,8 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
 k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
+k8s.io/metrics v0.0.0-20210329115205-064a2af7ea58 h1:Kaa60K3YA3IYDw2/9je7KvABzCn+pYtpzWUHJEUMW3k=
+k8s.io/metrics v0.0.0-20210329115205-064a2af7ea58/go.mod h1:QG0bPp0zOXJA75T+e7xRiZiGDWeu8H9mxCBCRacqkTs=
 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=