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 2021-10-06 05:34:32 -07:00
commit a10d84e72f
2 changed files with 18 additions and 18 deletions

16
go.mod
View File

@ -5,16 +5,16 @@ module k8s.io/sample-controller
go 1.15
require (
k8s.io/api v0.0.0-20210712061735-c542627fda65
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3
k8s.io/api v0.0.0-20211006163548-14384843a070
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87
k8s.io/code-generator v0.0.0-20211006163016-4100a7936525
k8s.io/klog/v2 v2.4.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/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/api => k8s.io/api v0.0.0-20211006163548-14384843a070
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
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
)

20
go.sum
View File

@ -302,8 +302,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=
@ -424,14 +424,14 @@ 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/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 h1:uEzxOoOZ4PlIidZ76iFj8AxxMIMVq7FsfbPB+huVg0w=
k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3/go.mod h1:i6FmG+QxaLxvJsezvZp0q/gAEzzOz3U53KFibghWToU=
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/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 h1:jDmEb6IUIJOBuA1FXZVtYJvDqyy0uxYsrZPZCkSqR70=
k8s.io/code-generator v0.0.0-20211006163016-4100a7936525/go.mod h1:MN7M2OmA4DntSwTmKqoB92uDBwM+OE0XtZ9piV7SXG4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=