Skip to content

Commit 4de511a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#92438 from liggitt/1.14
go1.14 fixup
2 parents a463b25 + d9bb0b8 commit 4de511a

File tree

218 files changed

+14018
-14765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+14018
-14765
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
module k8s.io/kubernetes
88

9-
go 1.13
9+
go 1.14
1010

1111
require (
1212
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
@@ -105,7 +105,7 @@ require (
105105
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
106106
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f
107107
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
108-
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4
108+
golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0
109109
gonum.org/v1/gonum v0.6.2
110110
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
111111
google.golang.org/api v0.15.1
@@ -429,10 +429,10 @@ replace (
429429
golang.org/x/net => golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
430430
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
431431
golang.org/x/sync => golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
432-
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
432+
golang.org/x/sys => golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf // pinned to release-branch.go1.14-std
433433
golang.org/x/text => golang.org/x/text v0.3.3
434434
golang.org/x/time => golang.org/x/time v0.0.0-20191024005414-555d28b269f0
435-
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
435+
golang.org/x/tools => golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0 // pinned to release-branch.go1.14
436436
golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
437437
gonum.org/v1/gonum => gonum.org/v1/gonum v0.6.2
438438
gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,14 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 h1:pE8b58s1HRDMi8RDc79m0H
491491
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
492492
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
493493
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
494-
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
495-
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
494+
golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf h1:+4j7oujXP478CVb/AFvHJmVX5+Pczx2NGts5yirA0oY=
495+
golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
496496
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
497497
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
498498
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
499499
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
500-
golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 h1:PVCvyir09Xgta5zksNZDkrL+eSm/Y+gQxRG3IfqNQ3A=
501-
golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
500+
golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0 h1:6txNFSnY+tteYoO+hf01EpdYcYZiurdC9MDIrcUzEu4=
501+
golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
502502
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
503503
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
504504
gonum.org/v1/gonum v0.6.2 h1:4r+yNT0+8SWcOkXP+63H2zQbN+USnC73cjGUxnDF94Q=

‎hack/.staticcheck_failures‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ pkg/controller/replicaset
77
pkg/controller/resourcequota
88
pkg/controller/statefulset
99
pkg/util/coverage
10+
pkg/volume/azure_dd
11+
pkg/volume/gcepd
12+
pkg/volume/rbd
13+
pkg/volume/testing
14+
pkg/volume/vsphere_volume
1015
test/e2e/apps
1116
test/e2e/autoscaling
17+
test/e2e_node
1218
test/integration/examples
1319
test/integration/framework
1420
test/integration/garbagecollector
1521
test/integration/scheduler_perf
1622
test/integration/ttlcontroller
23+
vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip
1724
vendor/k8s.io/apimachinery/pkg/api/meta
1825
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
1926
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme
@@ -42,6 +49,7 @@ vendor/k8s.io/apiserver/pkg/registry/generic/registry
4249
vendor/k8s.io/apiserver/pkg/registry/generic/rest
4350
vendor/k8s.io/apiserver/pkg/registry/rest/resttest
4451
vendor/k8s.io/apiserver/pkg/server
52+
vendor/k8s.io/apiserver/pkg/server/dynamiccertificates
4553
vendor/k8s.io/apiserver/pkg/server/filters
4654
vendor/k8s.io/apiserver/pkg/server/healthz
4755
vendor/k8s.io/apiserver/pkg/server/httplog
@@ -60,6 +68,7 @@ vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc
6068
vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
6169
vendor/k8s.io/apiserver/plugin/pkg/authorizer/webhook
6270
vendor/k8s.io/cli-runtime/pkg/printers
71+
vendor/k8s.io/client-go/discovery
6372
vendor/k8s.io/client-go/discovery/cached/memory
6473
vendor/k8s.io/client-go/dynamic/fake
6574
vendor/k8s.io/client-go/metadata/fake

‎hack/lib/golang.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ EOF
468468
local go_version
469469
IFS=" " read -ra go_version <<< "$(go version)"
470470
local minimum_go_version
471-
minimum_go_version=go1.13.4
471+
minimum_go_version=go1.14.4
472472
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
473473
kube::log::usage_from_stdin <<EOF
474474
Detected go version: ${go_version[*]}.

‎hack/lint-dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2727

2828
# Explicitly opt into go modules, even though we're inside a GOPATH directory
2929
export GO111MODULE=on
30-
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
31-
export GOFLAGS=
30+
# Explicitly set GOFLAGS to ignore vendor, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
31+
export GOFLAGS=-mod=mod
3232
# Detect problematic GOPROXY settings that prevent lookup of dependencies
3333
if [[ "${GOPROXY:-}" == "off" ]]; then
3434
kube::log::error "Cannot run with \$GOPROXY=off"

‎hack/tools/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kubernetes/hack/tools
22

3-
go 1.13
3+
go 1.14
44

55
require (
66
github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798
@@ -10,6 +10,6 @@ require (
1010
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
1111
gotest.tools v2.2.0+incompatible
1212
gotest.tools/gotestsum v0.3.5
13-
honnef.co/go/tools v0.0.1-2019.2.2
13+
honnef.co/go/tools v0.0.1-2020.1.4
1414
k8s.io/repo-infra v0.0.1-alpha.1
1515
)

‎hack/tools/go.sum‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,11 @@ golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3
315315
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
316316
golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
317317
golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
318-
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
319318
golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
320319
golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72 h1:bw9doJza/SFBEweII/rHQh338oozWyiFsBRHtrflcws=
321320
golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
321+
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d h1:/iIZNFGxc/a7C3yWjGcnboV+Tkc7mxr+p6fDztwoxuM=
322+
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
322323
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
323324
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
324325
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -357,8 +358,8 @@ gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpA
357358
grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
358359
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
359360
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
360-
honnef.co/go/tools v0.0.1-2019.2.2 h1:TEgegKbBqByGUb1Coo1pc2qIdf2xw6v0mYyLSYtyopE=
361-
honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
361+
honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
362+
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
362363
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
363364
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
364365
k8s.io/repo-infra v0.0.1-alpha.1 h1:2us1n30u3cOcoPsacNfCvCssS9B9Yldr1ZGOdK0728U=

‎hack/update-vendor-licenses.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ process_content () {
134134
# MAIN
135135
#############################################################################
136136

137+
# use modules, and use module info rather than the vendor dir for computing dependencies
137138
export GO111MODULE=on
139+
export GOFLAGS=-mod=mod
138140

139141
# Check bash version
140142
if (( BASH_VERSINFO[0] < 4 )); then

‎hack/update-vendor.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
# Explicitly opt into go modules, even though we're inside a GOPATH directory
2525
export GO111MODULE=on
26-
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
27-
export GOFLAGS=
26+
# Explicitly set GOFLAGS to ignore vendor, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
27+
export GOFLAGS=-mod=mod
2828
# Ensure sort order doesn't depend on locale
2929
export LANG=C
3030
export LC_ALL=C
@@ -327,8 +327,16 @@ go mod vendor >>"${LOG_FILE}" 2>&1
327327

328328
# sort recorded packages for a given vendored dependency in modules.txt.
329329
# `go mod vendor` outputs in imported order, which means slight go changes (or different platforms) can result in a differently ordered modules.txt.
330-
# scan | prefix comment lines with the module name | sort field 1 | strip leading text on comment lines
331-
awk '{if($1=="#") print $2 " " $0; else print}' < vendor/modules.txt | sort -k1,1 -s | sed 's/.*#/#/' > "${TMP_DIR}/modules.txt.tmp"
330+
# 1. prefix '#' lines with the module name and capture the module name
331+
# 2. prefix '##' with the most recently captured module name
332+
# 3. output other lines as-is
333+
# sort lines
334+
# strip anything before '#'
335+
awk '{
336+
if($1=="#") { current_module=$2; print $2 " " $0; }
337+
else if($1=="##") { print current_module " " $0; }
338+
else { print }
339+
}' < vendor/modules.txt | sort -k1,1 -s | sed 's/[^#]*#/#/' > "${TMP_DIR}/modules.txt.tmp"
332340
mv "${TMP_DIR}/modules.txt.tmp" vendor/modules.txt
333341

334342
# create a symlink in vendor directory pointing to the staging components.

‎staging/src/k8s.io/api/go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module k8s.io/api
44

5-
go 1.13
5+
go 1.14
66

77
require (
88
github.com/gogo/protobuf v1.3.1
@@ -11,8 +11,7 @@ require (
1111
)
1212

1313
replace (
14-
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
15-
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
14+
golang.org/x/sys => golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf // pinned to release-branch.go1.14-std
1615
k8s.io/api => ../api
1716
k8s.io/apimachinery => ../apimachinery
1817
)

0 commit comments

Comments
 (0)