Merge pull request #102601 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.21

Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6

Kubernetes-commit: e010ed4d8e511e931166d209dc63a79199cfcd58
This commit is contained in:
Kubernetes Publisher 2021-10-06 07:28:33 -07:00
commit 3ce82d8893
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.16
require (
k8s.io/api v0.0.0-20211006124257-4f1f1b38f4e2
k8s.io/apimachinery v0.0.0-20211006123701-67becc17bd24
k8s.io/client-go v0.0.0-20211006125154-b01669a62d42
k8s.io/code-generator v0.0.0-20211006123149-3320c909fca2
k8s.io/api v0.0.0-20211006163708-86d955a525a9
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/client-go v0.0.0-20211006164548-cd49ed727a6b
k8s.io/code-generator v0.0.0-20211006163100-f784720748de
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211006124257-4f1f1b38f4e2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006123701-67becc17bd24
k8s.io/client-go => k8s.io/client-go v0.0.0-20211006125154-b01669a62d42
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211006123149-3320c909fca2
k8s.io/api => k8s.io/api v0.0.0-20211006163708-86d955a525a9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211006164548-cd49ed727a6b
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211006163100-f784720748de
)

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=
@ -420,14 +420,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-20211006124257-4f1f1b38f4e2 h1:6GcNDAMoc1mDbRk6YLa0Gjz5lGaDq+/iVnN0keuWt1E=
k8s.io/api v0.0.0-20211006124257-4f1f1b38f4e2/go.mod h1:o+V8EpXyoQ1qFpTmnlBEwKRfB6+DTjavW6LTfe8tX4g=
k8s.io/apimachinery v0.0.0-20211006123701-67becc17bd24 h1:MPkV91HWEQk8f2VTFHvO+Hr4tg6xVQjo6QMdQBVEMgM=
k8s.io/apimachinery v0.0.0-20211006123701-67becc17bd24/go.mod h1:z++XKWqeVebPVvpbvKbPpPdWm2t0C5jpIi67OOoLaPY=
k8s.io/client-go v0.0.0-20211006125154-b01669a62d42 h1:lzFDd01kUrNnwxW1n0RxwHdGRNqNEXBVZLFeeEwOxdc=
k8s.io/client-go v0.0.0-20211006125154-b01669a62d42/go.mod h1:4Q+LaBW8RP0p/3F8TdVSRMUBU6HmG+IeLe4KpTsrL6I=
k8s.io/code-generator v0.0.0-20211006123149-3320c909fca2 h1:XOsOY6iGk762JgmRRAk4l6nPfGk/0tuTczXiebGcTdI=
k8s.io/code-generator v0.0.0-20211006123149-3320c909fca2/go.mod h1:4ueArHNjptLKuciTDe2d0FI9vgCWrK58O6g7Zt5efzk=
k8s.io/api v0.0.0-20211006163708-86d955a525a9 h1:fgsa+Z/Z0SKWRq6ptOqaQsxgSW0/VzFQUlDksN4tnu0=
k8s.io/api v0.0.0-20211006163708-86d955a525a9/go.mod h1:Qj3SN+1Iyz/YY45v5zFHtGeMTDma1zNbjEE5tjjtRqc=
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9 h1:IIhOqTAjGOnbZAV2xL43WdlYP0ytfhqans3r+90NwJQ=
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9/go.mod h1:cIJZ64G7RXojne0VMbraJhyZENr8Bep45PAX1zJlfLQ=
k8s.io/client-go v0.0.0-20211006164548-cd49ed727a6b h1:AD0KqzPewL5qC5zWKPqy3eTcaY5+ugpo55h6wbWOBFw=
k8s.io/client-go v0.0.0-20211006164548-cd49ed727a6b/go.mod h1:lKnrB/WdmMYYkE9vNFGnKTfaJH87L0szqVNXBARna7Q=
k8s.io/code-generator v0.0.0-20211006163100-f784720748de h1:xUYzsuDMXgQeOBIwN4yn6J3rWWjgdANj7WljgCvvvUo=
k8s.io/code-generator v0.0.0-20211006163100-f784720748de/go.mod h1:1rjClMZOJxt64EX39Cxs1M60KWy6l9D716HBuy5eWfg=
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=