cni: update to v1.1.2

Bumping cni to version v0.8.0-171-gca96f4c, which comprises the following commits:

    a899051 libcni: add version v1.1.0
    c768dcb SPEC: bump version to v1.1.0-dev
    e34f9d2 build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.7 to 2.11.0
    2161bf8 build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.4 to 2.9.7
    b6608f8 build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.2 to 2.9.4
    15612fc build(deps): bump github.com/onsi/ginkgo/v2 from 2.8.0 to 2.9.2
    10ec024 build(deps): bump actions/setup-go from 3 to 4
    db718fc build(deps): bump github.com/containernetworking/plugins
    9302e5f enable more linters
    05f80e4 3rd party plugins - spiderpool
    aef15f6 Porting over getCachedNetworkInfo routine from cri-o
    435fcb1 add meeting link to README
    d4c7848 ci(lint): enable errorlint linter
    1ffb655 fix wrong notes for ValidateInterfaceName()
    420e594 Extend capabilities with cgroup path
    024c57f build(deps): bump github.com/vishvananda/netns from 0.0.2 to 0.0.4
    121798a build(deps): bump github.com/onsi/ginkgo/v2 from 2.7.0 to 2.8.0
    da8672c ci(lint): setup lint job
    8ac5c8a build(deps): bump github.com/onsi/ginkgo/v2 from 2.6.1 to 2.7.0
    5fa3464 build(deps): bump github.com/vishvananda/netns from 0.0.1 to 0.0.2
    45761d9 update github.com/vishvananda/netns to v0.0.1
    aeb1d8e build(deps): bump github.com/containernetworking/plugins
    dd2d40c build(deps): bump github.com/containernetworking/cni in /plugins/debug
    9795493 Update dependabot.yml
    0a26996 build(deps): bump alpine in /.github/actions/retest-action
    cc03617 build(deps): bump github.com/onsi/gomega from 1.17.0 to 1.24.2
    55be4cc Create dependabot.yml
    f024754 refactor: move from io/ioutil to io and os packages

Bumping cni-plugins.git to version v1.1.0-181-g9d9ec6e3, which comprises the following commits:

    c1a7948b vrf: fix route filter to use output iface
    8e69e38d test_linux.sh: Do not fail if called twice
    0a100e5d meta: firewall: Fix firewalld test with non-abstract sockets
    3eb775c5 plugins: meta: portmap: Implement a teardown() fast path
    719f60bb utils: iptables: Use go-iptables' ChainExists()
    2ba7f160 spoofcheck: Make use of go-nft's ApplyConfigEcho()
    ba41448f test: install binaries using `go install`
    13fd3de7 build(deps): bump golang.org/x/sys from 0.9.0 to 0.10.0
    470eee13 [tuning]add ability to set tx queue len
    2216cff9 build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.2 to 2.11.0
    83029bef build(deps): bump golang.org/x/sys from 0.7.0 to 0.9.0
    48aa2f4e Fix race conditions in DHCP test
    ca12d49b Add routes propagation for VRF plugin
    0389a290 github: remove stale issue cleanup
    edab9efd tap: allow for a tap device to be created as a bridge port
    1b2dc7c2 build(deps): bump alpine in /.github/actions/retest-action
    7e918412 [sbr]: Ignore LinkNotFoundError during cmdDel
    99b475ab build(deps): bump github.com/Microsoft/hcsshim from 0.9.8 to 0.9.9
    d8fc886b Bump to golang 1.20 to pick up go1.19.6 / go1.20.1 CVE fixes
    c347755f Fix ValidateExpectedRoute with non default routes and nil GW
    5b7a263e tuning: fix cmdCheck when using IFNAME
    135292e0 bridge, del: timeout after 55 secs of trying to list rules
    7dcd738d bridge, spoofcheck: only read the prerouting chain on CNI delete
    83fe87c5 build: consume specific tables/chains via go-nft
    090af7db bridge: add vlan trunk support
    10ddd9e4 enable govet and unparam linters
    435ef223 build(deps): bump golang.org/x/sys from 0.6.0 to 0.7.0
    821982da Add parameter to disable default vlan
    cac8230e bridge, spoof check: remove drop rule index
    bc5f3def go.mod: bump all deps
    7bbd4d19 linter: fix ginkgolinter errors
    6c0d73ec Fix wastedassign linter errors
    086f7eb7 build(deps): bump actions/stale from 7 to 8
    d71d0f2d Fix revive linter errors
    00e0d3b7 build(deps): bump actions/setup-go from 3 to 4
    2fb0efe8 enable durationcheck,  predeclared, unconvert, unused and wastedassign linters
    c0fe3b7b remove govet and gofmt from test_linux.sh
    09f36a29 enable ginkgolinter linter
    a02bf4b4 enable revive linter
    79f52468 enable gocritic linter
    5a7619c0 enable gosimple linter
    709e775b enable  nonamedreturns linter
    3a04eb00 enable ineffassign linter
    16ba4222 enable contextcheck linter
    177e0bf2 enable staticcheck linter
    d12b81de ci(lint): setup golangci-lint
    6223674f ci(lint): setup yamllint linter Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
    9ee4d322 Fix overwritten error var in getMTUByName
    2d1005ec Update tests to utilize ginkgo/v2
    23c21341 Update ginkgo to v2 in go.mod, go.sum, vendor
    01d00314 Tap plugin
    9a2f7633 build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.26.0
    29e64861 build(deps): bump golang.org/x/sys from 0.4.0 to 0.5.0
    fb5d195f Only check ipv6 when an IPv6 is configured
    ac7cf825 Add support for in-container master for macvlans
    c798f809 Add support for in-container master for ipvlan
    9fa80036 Add support for in-container master for vlans
    2c4c27eb bridge: re-fetch mac address
    0fc229df Update Allocate method to reuse lease if present
    ec924a4b build(deps): bump github.com/safchain/ethtool to v0.2.0
    20a92ff3 build(deps): bump golang.org/x/sys from 0.3.0 to 0.4.0
    fa2ed0fd Add IPv6 support for AddDefaultRoute
    b769956c build(deps): bump github.com/containernetworking/cni from 1.0.1 to 1.1.2
    df141fc7 build(deps): bump github.com/coreos/go-systemd/v22 from 22.3.2 to 22.5.0
    35047644 build(deps): bump github.com/onsi/ginkgo from 1.16.4 to 1.16.5
    352f181f build(deps): bump alpine in /.github/actions/retest-action
    91b1a0e3 build(deps): bump github.com/godbus/dbus/v5 from 5.0.4 to 5.1.0
    648dd2e1 build(deps): bump github.com/vishvananda/netlink
    615420fa build(deps): bump github.com/alexflint/go-filemutex from 1.1.0 to 1.2.0
    90ed30a5 build(deps): bump github.com/Microsoft/hcsshim from 0.8.20 to 0.9.6
    020b8db6 build(deps): bump github.com/onsi/gomega from 1.15.0 to 1.24.2
    c5e81e3c Update dependabot.yml
    3be17f4a build(deps): bump actions/checkout from 2 to 3
    f64652fa build(deps): bump actions/stale from 4 to 7
    edfd2274 build(deps): bump actions/setup-go from 2 to 3
    d7efab18 Update dependabot.yml
    12471312 Update dependabot.yml
    c1e2be27 ci(deps): setup dependabot
    fd9408bc Fix tuning path validation
    9dc2ed2c Update email to gmail
    6b30e290 Update portmap test's iptables error check
    1a6f4789 Remove references to io/ioutil package
    63a6dbcf fix bug on getting NextIP of addresses with first byte 0
    198ab129 Fix path substitution to enable setting sysctls on vlan interfaces
    0463fd19 support masquerade all config
    87c3643d host-local: remove unused Release(ip) from type Store interface
    f89a0057 Cleanup Socket and Pidfile on exit
    7fcf8e48 dummy: Create a Dummy CNI plugin that creates a virtual interface.
    c78e1e46 Use the same options for acquiring, renewing lease
    9f4090da bridge: update vlanFiltering variable to make code more readable
    f1aa6c26 ci: only rerun failed jobs on `/retest`
    bf4068e1 build: support riscv64
    7c452c77 Check for duplicated sysctl keys
    f8917228 Update github.com/vishvananda/netlink to v1.2.0-beta
    a70e87c3 bridge: support IPAM DNS settings
    0a0853a7 Bump to go 1.18
    8b8825bc    V2 API support for win-overlay CNI
    e3d563b0 bug: return errors when iptables and ip6tables are unusable
    e952f16c github: ignore issues with "keep" label from stale closing
    5ad4fcf8 Make description for `static` plugin more exact
    57c1cb50 workflow: add something to auto-close stale PRs
    7a989794 ipam/dhcp: Fix client id in renew/release
    7aa07efe call ipam.ExceDel after clean up device in netns fix #666
    96c3af81 Add sysctl allowlist

Bumping flannel-cni-plugin.git to version v1.1.2-13-g6464faa, which comprises the following commits:

    6464faa Fixed release artifacts path
    bff4cf9 FIx bug in actions/download-artifact@v3
    ffabfad Update go.mod
    088da1a Use writeAndSyncFile instead of just write
    04854df Update ginkgo to v2
    eb47c95 Upgrade go version to 1.20.5
    6f13a99 Fix some errors thrown by lint tool
    3511c0a Updated Docker registry
    f271951 only include the binary file for one architecture in the release archive
    1537c92 update of GH workflows

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 06cef81f..71880cd1 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -9,13 +9,13 @@ Because of this focus, CNI has a wide range of support and the specification \
 is simple to implement. \
 "
 
-SRCREV_cni = "f024754da8d49bdac31d99d04355ddfe0340f8eb"
-SRCREV_plugins = "4744ec27b89c083194e7df498de50f03a8a1d3ec"
-SRCREV_flannel_plugin = "a2398ab1a85101d5b2d2180dc731215d65b2be9a"
+SRCREV_cni = "ca96f4ca96d89f4d7fbce885af1d66046b45342f"
+SRCREV_plugins = "9d9ec6e3e18ea245b9cef0f8396e570247338d1f"
+SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
         git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https \
-        git://github.com/containernetworking/plugins.git;branch=release-1.1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
+        git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
         git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel \
         "
 LICENSE = "Apache-2.0"