mirror of
https://github.com/kubernetes/kubectl.git
synced 2026-05-28 04:35:50 -04:00
Merge pull request #102602 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.20
Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6 Kubernetes-commit: 4aceb6799141cb2ed8195a6fa6f028e571eec935
This commit is contained in:
Kubernetes Publisher
commit
8e477ab533
2 changed files with 32 additions and 32 deletions
30
go.mod
30
go.mod
|
|
@ -34,27 +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-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/api v0.0.0-20211006163548-14384843a070
|
||||
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
|
||||
k8s.io/cli-runtime v0.0.0-20211006171459-c87d93023a10
|
||||
k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87
|
||||
k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062
|
||||
k8s.io/component-helpers v0.0.0-20211006165241-1cc2e0c5f3c5
|
||||
k8s.io/klog/v2 v2.4.0
|
||||
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
|
||||
k8s.io/metrics v0.0.0-20210712073416-cbf3b5c760c9
|
||||
k8s.io/metrics v0.0.0-20211006171305-95f9d2efa21b
|
||||
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 => 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
|
||||
k8s.io/api => k8s.io/api v0.0.0-20211006163548-14384843a070
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211006171459-c87d93023a10
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211006163016-4100a7936525
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211006165241-1cc2e0c5f3c5
|
||||
k8s.io/metrics => k8s.io/metrics v0.0.0-20211006171305-95f9d2efa21b
|
||||
)
|
||||
|
|
|
|||
34
go.sum
34
go.sum
|
|
@ -491,8 +491,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
|
||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
|
|
@ -625,19 +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/api v0.0.0-20211006163548-14384843a070 h1:PrGxR6a22mtoEErqSzyltsRxQageCzbVz8mteNEPMZo=
|
||||
k8s.io/api v0.0.0-20211006163548-14384843a070/go.mod h1:gHOy/bdYum9Xwc8Ku9HoIGlC1tK+Ca3mlbXyeZ2/m/g=
|
||||
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71 h1:eyFEspMIgGSOTKwfII+oBcWX9gXJ6uXkNeeyymDHYRI=
|
||||
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71/go.mod h1:uM7hCI0NyBymUwgshMgZyte475lxhr+QH6h3cvdnzEc=
|
||||
k8s.io/cli-runtime v0.0.0-20211006171459-c87d93023a10 h1:XmAXptcSCB7eQIsRa7yhYPGdLajGqi5Ps7oMMYfaR3Q=
|
||||
k8s.io/cli-runtime v0.0.0-20211006171459-c87d93023a10/go.mod h1:PcyI4ODbUgh3KgDkCBioFtuqc/G4LpJQcLKo8KFHOwk=
|
||||
k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87 h1:ybAxnG6RHTtPOOR4hbR0PLwswlrjgq4VcupKZTu45Pc=
|
||||
k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87/go.mod h1:fFi+f8HlL6qZD1lkepeJAf+COWsznTlc6FanXk8VWw4=
|
||||
k8s.io/code-generator v0.0.0-20211006163016-4100a7936525/go.mod h1:MN7M2OmA4DntSwTmKqoB92uDBwM+OE0XtZ9piV7SXG4=
|
||||
k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062 h1:TGn6A7j7u7KNM1FKo4IumJXxPoiK3GUdz4CHPfB0gmk=
|
||||
k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062/go.mod h1:5HjuZhcUqTEgu0RbviT4QN+MFnT8hbITUF7FsgDfOOc=
|
||||
k8s.io/component-helpers v0.0.0-20211006165241-1cc2e0c5f3c5 h1:vS+V2t+e7NEJS+glOJh7XDYPEnSu2WNRLovAVLgvOuA=
|
||||
k8s.io/component-helpers v0.0.0-20211006165241-1cc2e0c5f3c5/go.mod h1:f8K44U3XV3p81rmj0oqitmqJAhbgf3hQ5w3UBZ5gIAE=
|
||||
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=
|
||||
|
|
@ -646,8 +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/metrics v0.0.0-20211006171305-95f9d2efa21b h1:M2wHJqCvrojkyC0FeeK1UfuI2jkFrPhsqcrOg2oyqOE=
|
||||
k8s.io/metrics v0.0.0-20211006171305-95f9d2efa21b/go.mod h1:86oFHQMTuPjqtSd65BFgIYnh59x2FChCCBz7uqE0HGc=
|
||||
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=
|
||||
|
|
|
|||
Loading…
Reference in a new issue