01a94e17c7
Add nftables backend to portmap
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-09-16 21:17:49 +02:00
3d1968c152
Fix portmap unit tests
...
Use `conditionsV4` and `conditionsV6` values that actually look like
valid iptables conditions.
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-09-16 21:17:49 +02:00
a3ccebc6ec
Add a backend abstraction to the portmap plugin
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-09-16 21:17:49 +02:00
61d078645a
Add nftables implementation of ipmasq
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-09-16 21:17:49 +02:00
729dd23c40
Vendor nftables library, add utils.SupportsIPTables and utils.SupportsNFTables
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-09-16 21:17:49 +02:00
a6d6efa5ca
Use of Scope for routes in IPAM
...
Add Scope for routes for cni spec v1.1
Signed-off-by: Lionel Jouin <lionel.jouin@est.tech >
2024-09-16 17:06:21 +02:00
01b3db8e01
SBR: option to pass the table id ( #1088 )
...
* Use of Table ID in IPAM
Signed-off-by: Lionel Jouin <lionel.jouin@est.tech >
* SBR: option to pass the table id
Using the option to set the table number in the SBR meta plugin will
create a policy route for each IP added for the interface returned by
the main plugin.
Unlike the default behavior, the routes will not be moved to the table.
The default behavior of the SBR plugin is kept if the table id is not set.
Signed-off-by: Lionel Jouin <lionel.jouin@est.tech >
---------
Signed-off-by: Lionel Jouin <lionel.jouin@est.tech >
2024-09-09 17:07:23 +02:00
20f31e5e88
Merge pull request #1083 from danwinship/update-deps
...
update deps (go-iptables, cni)
2024-08-29 12:28:03 +02:00
06ba001d84
Update containernetworking/cni to v1.2.3 for GC
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-08-28 12:17:48 -04:00
deb8ef63f4
Update go-iptables
...
Signed-off-by: Dan Winship <danwinship@redhat.com >
2024-08-28 08:59:45 -04:00
720b1e9811
Merge pull request #1074 from champtar/macvlan-bcqueuelen
...
macvlan: add bcqueuelen setting
2024-08-27 17:01:05 +02:00
bdb6814fe2
macvlan: add bcqueuelen setting
...
This setting was introduced in Linux 5.11
d4bff72c8442f5642a40e.champetier@ateme.com >
2024-08-27 09:21:29 -04:00
3653221fad
Merge pull request #1076 from lisongmin/main
...
Fix unnecessary retrying when the link is down in dhcp
2024-08-27 10:31:03 +02:00
0d2780f0e7
Merge branch 'main' into main
2024-08-27 10:20:16 +02:00
5def33291f
Merge pull request #1081 from containernetworking/dependabot/go_modules/golang-9c8d4662b4
...
build(deps): bump the golang group across 1 directory with 4 updates
2024-08-27 10:18:17 +02:00
07bd325095
build(deps): bump the golang group across 1 directory with 4 updates
...
Bumps the golang group with 2 updates in the / directory: [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim ) and [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo ).
Updates `github.com/Microsoft/hcsshim` from 0.12.4 to 0.12.6
- [Release notes](https://github.com/Microsoft/hcsshim/releases )
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.12.4...v0.12.6 )
Updates `github.com/onsi/ginkgo/v2` from 2.19.0 to 2.20.1
- [Release notes](https://github.com/onsi/ginkgo/releases )
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/ginkgo/compare/v2.19.0...v2.20.1 )
Updates `github.com/onsi/gomega` from 1.33.1 to 1.34.1
- [Release notes](https://github.com/onsi/gomega/releases )
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/gomega/compare/v1.33.1...v1.34.1 )
Updates `golang.org/x/sys` from 0.21.0 to 0.23.0
- [Commits](https://github.com/golang/sys/compare/v0.21.0...v0.23.0 )
---
updated-dependencies:
- dependency-name: github.com/Microsoft/hcsshim
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
- dependency-name: github.com/onsi/ginkgo/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
- dependency-name: golang.org/x/sys
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-08-27 07:43:01 +00:00
7cff5db82a
Merge pull request #1080 from champtar/update-netlink
...
build: update github.com/vishvananda/netlink to 1.3.0
2024-08-27 09:41:58 +02:00
d924f05e12
build: update github.com/vishvananda/netlink to 1.3.0
...
This includes a breaking change:
acdc658b86e.champetier@ateme.com >
2024-08-26 14:27:30 -04:00
6269f399a5
Fix unnecessary retrying when the link is down in dhcp.
...
From the dhcp daemon log, we can see that dhcp will fail to acquire
the lease when the link is down, and success on retry.
```
2024/08/21 21:30:44 macvlan-dhcp/eth1: acquiring lease
2024/08/21 21:30:44 Link "eth1" down. Attempting to set up
2024/08/21 21:30:44 network is down
2024/08/21 21:30:44 retrying in 2.641696 seconds
2024/08/21 21:30:49 macvlan-dhcp/eth1: lease acquired, expiration is 2024-08-22 09:30:49.755367962 +0800 CST m=+43205.712107889
```
After move the code of set up link to the beginning of the function, the
dhcp success on first time.
```
2024/08/21 22:04:02 macvlan-dhcp/eth1: acquiring lease
2024/08/21 22:04:02 Link "eth1" down. Attempting to set up
2024/08/21 22:04:05 macvlan-dhcp/eth1: lease acquired, expiration is 2024-08-22 10:04:05.297887726 +0800 CST m=+43203.081141304
```
Signed-off-by: Songmin Li <lisongmin@protonmail.com >
2024-08-24 19:54:34 +08:00
5188dc8a19
Merge pull request #1065 from squeed/bump-go
...
.github: bump go
2024-08-22 16:11:01 -06:00
675ca92261
test: bump go version
...
We were using the go.mod version, which we don't change as frequently.
Switch to use the GO_VERSION defined in the workflow file.
Signed-off-by: Casey Callendrello <c1@caseyc.net >
2024-07-15 16:58:48 +02:00
30078e1cfd
.github: fix double-triggering CI
...
We were accidentally running CI twice.
Signed-off-by: Casey Callendrello <c1@caseyc.net >
2024-07-15 16:53:23 +02:00
acf8ddc8e1
Merge pull request #1058 from s1061123/fix/1053b
...
Change chown to change current dir as well
2024-06-24 17:20:49 +02:00
352c8b7ab5
Change chown to change current dir as well
...
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com >
2024-06-24 16:57:53 +02:00
11ad58cf20
Merge pull request #1060 from containernetworking/dependabot/go_modules/golang-6263b2479d
...
build(deps): bump the golang group with 2 updates
2024-06-24 12:11:17 +02:00
d5f9ad99d7
build(deps): bump the golang group with 2 updates
...
Bumps the golang group with 2 updates: [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim ) and [github.com/safchain/ethtool](https://github.com/safchain/ethtool ).
Updates `github.com/Microsoft/hcsshim` from 0.12.3 to 0.12.4
- [Release notes](https://github.com/Microsoft/hcsshim/releases )
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.12.3...v0.12.4 )
Updates `github.com/safchain/ethtool` from 0.4.0 to 0.4.1
- [Release notes](https://github.com/safchain/ethtool/releases )
- [Commits](https://github.com/safchain/ethtool/compare/v0.4.0...v0.4.1 )
---
updated-dependencies:
- dependency-name: github.com/Microsoft/hcsshim
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
- dependency-name: github.com/safchain/ethtool
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-06-24 02:12:28 +00:00
c29dc79f96
Merge pull request #1056 from containernetworking/dependabot/go_modules/golang-82cdb19fbc
...
build(deps): bump the golang group across 1 directory with 3 updates
2024-06-17 17:46:35 +02:00
508c94caec
build(deps): bump the golang group across 1 directory with 3 updates
...
Bumps the golang group with 2 updates in the / directory: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo ) and [github.com/safchain/ethtool](https://github.com/safchain/ethtool ).
Updates `github.com/onsi/ginkgo/v2` from 2.17.3 to 2.19.0
- [Release notes](https://github.com/onsi/ginkgo/releases )
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/ginkgo/compare/v2.17.3...v2.19.0 )
Updates `github.com/safchain/ethtool` from 0.3.0 to 0.4.0
- [Release notes](https://github.com/safchain/ethtool/releases )
- [Commits](https://github.com/safchain/ethtool/compare/v0.3.0...v0.4.0 )
Updates `golang.org/x/sys` from 0.20.0 to 0.21.0
- [Commits](https://github.com/golang/sys/compare/v0.20.0...v0.21.0 )
---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
- dependency-name: github.com/safchain/ethtool
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
- dependency-name: golang.org/x/sys
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-06-17 15:23:00 +00:00
b96f963c7a
Merge pull request #1049 from containernetworking/dependabot/docker/dot-github/actions/retest-action/alpine-3.20
...
build(deps): bump alpine from 3.19 to 3.20 in /.github/actions/retest-action
2024-06-17 17:06:40 +02:00
518bc80c56
Merge pull request #1054 from s1061123/fix/1053
...
Fix release tar images' owner to root
2024-06-17 17:04:40 +02:00
434e9b9ef7
Fix release tar images' owner to root
...
Fix #1053
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com >
2024-06-17 11:06:40 +09:00
0e87bccf19
build(deps): bump alpine in /.github/actions/retest-action
...
Bumps alpine from 3.19 to 3.20.
---
updated-dependencies:
- dependency-name: alpine
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-27 02:43:07 +00:00
0259301ae2
Merge pull request #1043 from containernetworking/dependabot/go_modules/golang-efff583b38
...
build(deps): bump the golang group with 2 updates
2024-05-20 09:14:04 +02:00
14cad164ec
build(deps): bump the golang group with 2 updates
...
Bumps the golang group with 2 updates: [github.com/onsi/gomega](https://github.com/onsi/gomega ) and [golang.org/x/sys](https://github.com/golang/sys ).
Updates `github.com/onsi/gomega` from 1.33.0 to 1.33.1
- [Release notes](https://github.com/onsi/gomega/releases )
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/gomega/compare/v1.33.0...v1.33.1 )
Updates `golang.org/x/sys` from 0.19.0 to 0.20.0
- [Commits](https://github.com/golang/sys/compare/v0.19.0...v0.20.0 )
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
- dependency-name: golang.org/x/sys
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-20 02:50:01 +00:00
1868e4fe2d
Merge pull request #1035 from containernetworking/dependabot/github_actions/golangci/golangci-lint-action-6
2024-05-16 15:45:32 +00:00
5c95925a71
build(deps): bump golangci/golangci-lint-action from 4 to 6
...
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action ) from 4 to 6.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases )
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v4...v6 )
---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-16 15:35:37 +00:00
505f5a7def
Merge pull request #1042 from containernetworking/dependabot/go_modules/golang-e5a06e9046
2024-05-16 13:27:36 +00:00
dc8b8289fa
build(deps): bump the golang group across 1 directory with 4 updates
...
Bumps the golang group with 2 updates in the / directory: [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim ) and [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo ).
Updates `github.com/Microsoft/hcsshim` from 0.12.2 to 0.12.3
- [Release notes](https://github.com/Microsoft/hcsshim/releases )
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.12.2...v0.12.3 )
Updates `github.com/onsi/ginkgo/v2` from 2.17.1 to 2.17.3
- [Release notes](https://github.com/onsi/ginkgo/releases )
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/ginkgo/compare/v2.17.1...v2.17.3 )
Updates `github.com/onsi/gomega` from 1.32.0 to 1.33.0
- [Release notes](https://github.com/onsi/gomega/releases )
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md )
- [Commits](https://github.com/onsi/gomega/compare/v1.32.0...v1.33.0 )
Updates `golang.org/x/sys` from 0.18.0 to 0.19.0
- [Commits](https://github.com/golang/sys/compare/v0.18.0...v0.19.0 )
---
updated-dependencies:
- dependency-name: github.com/Microsoft/hcsshim
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
- dependency-name: github.com/onsi/ginkgo/v2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: golang
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
- dependency-name: golang.org/x/sys
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-16 13:16:06 +00:00
196ed2d00e
Merge pull request #1040 from squeed/dependabot-dont-bump-cni
...
dependabot: don't automatically update cni packages
2024-05-16 22:14:58 +09:00
43139b3375
Merge branch 'main' into dependabot-dont-bump-cni
2024-05-16 21:43:34 +09:00
18d129f18b
Merge pull request #1039 from squeed/bump-go-version
...
build: bump release go version
2024-05-16 21:42:44 +09:00
9397270f5e
dependabot: don't automatically update cni packages
...
We should manage their lifecycle separately.
Signed-off-by: Casey Callendrello <c1@caseyc.net >
2024-05-16 11:25:50 +02:00
3656c69d0f
build: bump release go version
...
Signed-off-by: Casey Callendrello <c1@caseyc.net >
2024-05-16 11:22:33 +02:00
3af6e6b61d
Merge pull request #1037 from s1061123/fix-buildversion
...
Fix release script in github action
2024-05-16 11:16:34 +02:00
427af8636f
Fix release script in github action
...
This changes adds BuildVersion linker flag in release to
fix CNI plugins output. Fixes #1019 .
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com >
2024-05-15 02:55:03 +09:00
dc704d19d6
Merge pull request #1034 from testwill/close_file
...
fix: close resolv.conf
2024-05-13 21:19:20 +09:00
45a24d5d95
Merge branch 'main' into close_file
2024-05-13 17:23:42 +09:00
c0533466c8
Merge pull request #1029 from samuelkarp/log-peer-veth-failure
...
ip: include peer name in error message
2024-05-13 17:23:30 +09:00
ada798a3f7
fix: close resolv.conf
...
Signed-off-by: guoguangwu <guoguangwug@gmail.com >
2024-05-08 20:38:15 +08:00
eb49a034c4
ip: include peer name in error message
...
If makeVeth fails as a peer exists, the existing peer name should be
included in the error message.
Signed-off-by: Samuel Karp <samuelkarp@google.com >
2024-04-26 15:49:08 -07:00
