Skip to content

Commit 27e830b

Browse files
authored
Merge pull request #691 from squeed/bump-go
Bump go to 1.17
2 parents 186edec + 0c12d8a commit 27e830b

File tree

33 files changed

+48
-1339
lines changed

33 files changed

+48
-1339
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: test
44
on: ["push", "pull_request"]
55

66
env:
7-
GO_VERSION: "1.16"
7+
GO_VERSION: "1.17"
88
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
99

1010
jobs:

go.mod

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containernetworking/plugins
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/Microsoft/hcsshim v0.8.20
@@ -18,8 +18,23 @@ require (
1818
github.com/onsi/ginkgo v1.16.4
1919
github.com/onsi/gomega v1.15.0
2020
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
21-
github.com/sirupsen/logrus v1.8.1 // indirect
2221
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
23-
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
2422
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
2523
)
24+
25+
require (
26+
github.com/Microsoft/go-winio v0.4.17 // indirect
27+
github.com/containerd/cgroups v1.0.1 // indirect
28+
github.com/fsnotify/fsnotify v1.4.9 // indirect
29+
github.com/gogo/protobuf v1.3.2 // indirect
30+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
31+
github.com/nxadm/tail v1.4.8 // indirect
32+
github.com/pkg/errors v0.9.1 // indirect
33+
github.com/sirupsen/logrus v1.8.1 // indirect
34+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
35+
go.opencensus.io v0.22.3 // indirect
36+
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
37+
golang.org/x/text v0.3.6 // indirect
38+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
39+
gopkg.in/yaml.v2 v2.4.0 // indirect
40+
)

pkg/ip/utils_linux.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
// Copyright 2016 CNI authors

scripts/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
1616
mkdir -p ${SRC_DIR}/${RELEASE_DIR}
1717
mkdir -p ${OUTPUT_DIR}
1818

19-
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.16-alpine \
19+
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.17-alpine \
2020
/bin/sh -xe -c "\
2121
apk --no-cache add bash tar;
2222
cd /go/src/github.com/containernetworking/plugins; umask 0022;

vendor/github.com/Microsoft/go-winio/go.mod

Lines changed: 0 additions & 9 deletions
This file was deleted.

vendor/github.com/Microsoft/go-winio/go.sum

Lines changed: 0 additions & 14 deletions
This file was deleted.

vendor/github.com/Microsoft/hcsshim/go.mod

Lines changed: 0 additions & 27 deletions
This file was deleted.

vendor/github.com/Microsoft/hcsshim/go.sum

Lines changed: 0 additions & 885 deletions
This file was deleted.

vendor/github.com/alexflint/go-filemutex/go.mod

Lines changed: 0 additions & 5 deletions
This file was deleted.

vendor/github.com/alexflint/go-filemutex/go.sum

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)