Skip to content

Bump up some dependencies and go version up to 1.23 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: '1.19.x'
go-version: '1.23.x'
- name: build and unit test
run: make build
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: '1.19.x'
go-version: '1.23.x'
- name: pretest
# see ../../TESTING.md for more information on this step
run: |
Expand All @@ -36,7 +36,7 @@ jobs:
- name: test
run: make e2e-test
- name: upload failed test artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: testlogs
Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ There is some tooling that needs to be in place for the tests to be able to run,

- Git - you can install either the `build-essential` meta package on Debian based distros or the package group called `'Development Tools'` on RHEL based distros and that will get you `git`. Otherwise, you can install Git separately as well.
- Make - the above meta package/package group will also include `make` but it can also be installed separately.
- Go - go can be installed from the golang website; the tests are confirmed working on Go version 1.19
- Go - go can be installed from the golang website; the tests are confirmed working on Go version 1.23
- `iptables` - in case the tests are being run in a minimal environment, `iptables` can be obtained from the default package manager for the distro; it is likely that it is already installed on the system

For the end to end tests, a successful build is also required. A build can be triggered by running `make build`.
Expand Down
26 changes: 16 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
module github.com/aws/amazon-vpc-cni-plugins

go 1.19
go 1.23

require (
github.com/Microsoft/go-winio v0.4.17
github.com/Microsoft/hcsshim v0.9.4
github.com/Microsoft/go-winio v0.6.2
github.com/Microsoft/hcsshim v0.12.9
github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf
github.com/containernetworking/cni v1.1.2
github.com/coreos/go-iptables v0.6.0
github.com/stretchr/testify v1.8.2
github.com/vishvananda/netlink v1.1.1-0.20210316144550-c21bda41e995
golang.org/x/sys v0.7.0
github.com/vishvananda/netlink v1.3.0
golang.org/x/sys v0.25.0
)

require (
github.com/containerd/cgroups v1.0.1 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/typeurl/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
go.opencensus.io v0.22.3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.opencensus.io v0.24.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
920 changes: 43 additions & 877 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vendor/github.com/Microsoft/go-winio/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/Microsoft/go-winio/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

147 changes: 147 additions & 0 deletions vendor/github.com/Microsoft/go-winio/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 76 additions & 9 deletions vendor/github.com/Microsoft/go-winio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions vendor/github.com/Microsoft/go-winio/SECURITY.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading