cni: update to v1.3.0

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

3 files changed, 22 insertions, 7 deletions

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 5e270df4..c8a6b394 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -9,9 +9,9 @@ Because of this focus, CNI has a wide range of support and the specification \
 is simple to implement. \
 "
 
-SRCREV_cni = "4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca"
-SRCREV_plugins = "35831f3d23956658aaa3109cbae0ce24d28137e6"
-SRCREV_flannel_plugin = "cc21427ce5b2c606ba5ececa0a488452e80d73f8"
+SRCREV_cni = "1d67f89a2e3cfc3c22da74d4f8490e65ca4a819c"
+SRCREV_plugins = "9b3772e1a7abf93cbb7c6526a28bc0d27b830e02"
+SRCREV_flannel_plugin = "5d45388ab25791ec961585d921d1a42d3cbcc139"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
         git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
@@ -32,8 +32,8 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464
 
 GO_IMPORT = "import"
 
-PV = "v1.2.3+git"
-CNI_VERSION = "v1.2.3"
+PV = "v1.3.0+git"
+CNI_VERSION = "v1.3.0"
 
 # go-mod-discovery configuration
 # The CNI repo has minimal dependencies. The plugins repo is a separate module
diff --git a/recipes-networking/cni/go-mod-cache.inc b/recipes-networking/cni/go-mod-cache.inc
index 52948f26..a116fcdd 100644
--- a/recipes-networking/cni/go-mod-cache.inc
+++ b/recipes-networking/cni/go-mod-cache.inc
@@ -8,6 +8,8 @@ inherit go-mod-vcs
 
 # Module metadata for cache building (one module per line)
 GO_MODULE_CACHE_DATA = '[\
+{"module":"github.com/spf13/cobra","version":"v1.9.1","vcs_hash":"b9eaed78e0a5f6d8926cb7b295c1304ebd0c79848e4fc0ad5e0ab83089f9081b","timestamp":"2025-02-16T23:42:04Z","subdir":"","vcs_ref":"refs/tags/v1.9.1"},\
+{"module":"github.com/spf13/pflag","version":"v1.0.6","vcs_hash":"b7f51c906eabb517613129455992f23a2f48e1c6186855b1b66ba9e619db1aa4","timestamp":"2025-01-09T00:37:54Z","subdir":"","vcs_ref":"refs/tags/v1.0.6"},\
 {"module":"github.com/vishvananda/netns","version":"v0.0.4","vcs_hash":"d15818789eb7bb00d665000b7884b01ceb67b9b437a04c9ecca082ba51e1565e","timestamp":"2023-01-23T18:27:00Z","subdir":"","vcs_ref":"refs/tags/v0.0.4"},\
 {"module":"github.com/google/go-cmp","version":"v0.6.0","vcs_hash":"066c8baed8b5c49c8bf75e59b5e0a559593a7098e3e99236e4fc5b6e29e3ac91","timestamp":"2023-08-31T17:32:40Z","subdir":"","vcs_ref":"refs/tags/v0.6.0"},\
 {"module":"github.com/google/pprof","version":"v0.0.0-20240727154555-813a5fbdbec8","vcs_hash":"01740331f170dffba2f38808727de567826c30b68d9ad7abb0f5ca900ca5a3ba","timestamp":"2024-07-27T15:45:55Z","subdir":"","vcs_ref":""},\
@@ -16,12 +18,15 @@ GO_MODULE_CACHE_DATA = '[\
 {"module":"github.com/go-logr/logr","version":"v1.4.2","vcs_hash":"9655eab28e005d39cc2bb4b149948f2765b6737fb833acda1ea9a8fa1c01f086","timestamp":"2024-05-20T10:45:40Z","subdir":"","vcs_ref":"refs/tags/v1.4.2"},\
 {"module":"github.com/ianlancetaylor/demangle","version":"v0.0.0-20240312041847-bd984b5ce465","vcs_hash":"190d0769fcb0583bb638d524115b887c6d000e04c6d64f1488a06b55bf5eac4c","timestamp":"2024-03-12T04:18:47Z","subdir":"","vcs_ref":""},\
 {"module":"github.com/go-task/slim-sprig/v3","version":"v3.0.0","vcs_hash":"8dd5020cf322cc4f91014ac7828ac4826cba4ce7da08320ac497d655159088a5","timestamp":"2023-09-14T01:46:41Z","subdir":"","vcs_ref":"refs/tags/v3.0.0"},\
-{"module":"github.com/containernetworking/cni","version":"v1.2.4-0.20240829080103-4c9ae43c0eaa","vcs_hash":"dfc8140cf68d46792c81038b0574be7d82808f552267e38eb21e351f504c653c","timestamp":"2024-08-29T08:01:03Z","subdir":"","vcs_ref":""},\
+{"module":"github.com/containernetworking/cni","version":"v1.3.1-0.20251110152224-1d67f89a2e3c","vcs_hash":"a3d62a01a5bcbd383225f2636ba0f99154ca2a81b07aad16b9e30e1630ea00f6","timestamp":"2025-11-10T15:22:24Z","subdir":"","vcs_ref":""},\
 {"module":"github.com/pmezard/go-difflib","version":"v1.0.0","vcs_hash":"c04ad296d2e3203fda8b7ca96feaca21b20b3b7441e33c7d67cda029ea61ab4c","timestamp":"2016-01-10T10:55:54Z","subdir":"","vcs_ref":"refs/tags/v1.0.0"},\
 {"module":"github.com/davecgh/go-spew","version":"v1.1.1","vcs_hash":"4c7d69cfe586f86079773ff48d94f76d327c2914d8dfeffca9e34fd1146e5d5e","timestamp":"2018-02-21T23:26:28Z","subdir":"","vcs_ref":"refs/tags/v1.1.1"},\
 {"module":"github.com/onsi/gomega","version":"v1.34.1","vcs_hash":"5d804844b09e94f5ebe51951fab8e7b49bdb61690fc0ffa035a4b0d39839fab2","timestamp":"2024-07-29T18:29:33Z","subdir":"","vcs_ref":"refs/tags/v1.34.1"},\
 {"module":"github.com/onsi/ginkgo/v2","version":"v2.20.1","vcs_hash":"250c6ed89fc0be4bae692e1c5f1f1e6828774d5a023a2a0844246ec3f2b52c01","timestamp":"2024-08-21T18:37:22Z","subdir":"","vcs_ref":"refs/tags/v2.20.1"},\
+{"module":"github.com/russross/blackfriday/v2","version":"v2.1.0","vcs_hash":"6dd1604eceba1790dbf7f827f1e22a5866a5348a2ab616daed7363a6e16e081d","timestamp":"2020-10-27T03:47:54Z","subdir":"v2","vcs_ref":"refs/tags/v2.1.0"},\
 {"module":"github.com/stretchr/testify","version":"v1.8.4","vcs_hash":"cec0eadb3ceb93408aae446eb0c115ea4a39cd4ba2048947ee55e1f8969c3872","timestamp":"2023-05-30T09:38:40Z","subdir":"","vcs_ref":"refs/tags/v1.8.4"},\
+{"module":"github.com/inconshreveable/mousetrap","version":"v1.1.0","vcs_hash":"a9f0ac4cf05240ceb9790811cbd8ab3cbdcd404501a9ca5a402a28033e7235d8","timestamp":"2022-11-27T22:01:53Z","subdir":"","vcs_ref":"refs/tags/v1.1.0"},\
+{"module":"github.com/cpuguy83/go-md2man/v2","version":"v2.0.6","vcs_hash":"0b9036af46cc50aa9433a461266e6ef3b3645807c3d1fa49cc53eb201e011781","timestamp":"2024-12-16T17:50:50Z","subdir":"","vcs_ref":"refs/tags/v2.0.6"},\
 {"module":"golang.org/x/sys","version":"v0.23.0","vcs_hash":"ab1c9d8044ec55ff95f7d385c76150aeabf000c2a14bc1775a1766dd90f14cda","timestamp":"2024-08-03T07:06:10Z","subdir":"","vcs_ref":"refs/tags/v0.23.0"},\
 {"module":"golang.org/x/mod","version":"v0.20.0","vcs_hash":"c837184171f2b9a408933cc7892b7ef003ef72a2d18747dc23c77f54fa57d62b","timestamp":"2024-07-30T14:22:55Z","subdir":"","vcs_ref":"refs/tags/v0.20.0"},\
 {"module":"golang.org/x/term","version":"v0.23.0","vcs_hash":"5c601017bf1fc28cce196476ddd88d281c6d676e09ca5cb41e9b848278953afd","timestamp":"2024-08-06T15:15:04Z","subdir":"","vcs_ref":"refs/tags/v0.23.0"},\
diff --git a/recipes-networking/cni/go-mod-git.inc b/recipes-networking/cni/go-mod-git.inc
index c5316588..5a8f3916 100644
--- a/recipes-networking/cni/go-mod-git.inc
+++ b/recipes-networking/cni/go-mod-git.inc
@@ -1,6 +1,8 @@
 # Generated by oe-go-mod-fetcher.py v3.0.0
 # Git repositories for Go module dependencies
 
+SRC_URI += "git://github.com/spf13/cobra;protocol=https;nobranch=1;rev=40b5bc1437a564fc795d388b23835e84f54cd1d1;name=git_41456771_0;destsuffix=vcs_cache/b9eaed78e0a5f6d8926cb7b295c1304ebd0c79848e4fc0ad5e0ab83089f9081b"
+SRC_URI += "git://github.com/spf13/pflag;protocol=https;nobranch=1;shallow=1;rev=5ca813443bd2a4d9f46a253ea0407d23b3790713;name=git_66b7b8c8_0;destsuffix=vcs_cache/b7f51c906eabb517613129455992f23a2f48e1c6186855b1b66ba9e619db1aa4"
 SRC_URI += "git://github.com/vishvananda/netns;protocol=https;nobranch=1;shallow=1;rev=7a452d2d15292b2bfb2a2d88e6bdeac156a761b9;name=git_e786acee_0;destsuffix=vcs_cache/d15818789eb7bb00d665000b7884b01ceb67b9b437a04c9ecca082ba51e1565e"
 SRC_URI += "git://github.com/google/go-cmp;protocol=https;nobranch=1;shallow=1;rev=c3ad8435e7bef96af35732bc0789e5a2278c6d5f;name=git_8726c33a_0;destsuffix=vcs_cache/066c8baed8b5c49c8bf75e59b5e0a559593a7098e3e99236e4fc5b6e29e3ac91"
 SRC_URI += "git://github.com/google/pprof;protocol=https;branch=main;rev=813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac;name=git_4d435d14_0;destsuffix=vcs_cache/01740331f170dffba2f38808727de567826c30b68d9ad7abb0f5ca900ca5a3ba"
@@ -9,12 +11,15 @@ SRC_URI += "git://github.com/yuin/goldmark;protocol=https;nobranch=1;shallow=1;r
 SRC_URI += "git://github.com/go-logr/logr;protocol=https;nobranch=1;shallow=1;rev=1205f429d540b8b81c2b75a38943afb738dac223;name=git_e0ff909e_0;destsuffix=vcs_cache/9655eab28e005d39cc2bb4b149948f2765b6737fb833acda1ea9a8fa1c01f086"
 SRC_URI += "git://github.com/ianlancetaylor/demangle;protocol=https;branch=master;rev=bd984b5ce465cae93d894caa85838021209b9a57;name=git_92f2e92b_0;destsuffix=vcs_cache/190d0769fcb0583bb638d524115b887c6d000e04c6d64f1488a06b55bf5eac4c"
 SRC_URI += "git://github.com/go-task/slim-sprig;protocol=https;nobranch=1;rev=b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894;name=git_0442e1d1_0;destsuffix=vcs_cache/8dd5020cf322cc4f91014ac7828ac4826cba4ce7da08320ac497d655159088a5"
-SRC_URI += "git://github.com/containernetworking/cni;protocol=https;branch=main;rev=4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca;name=git_4ce5ee0d_0;destsuffix=vcs_cache/dfc8140cf68d46792c81038b0574be7d82808f552267e38eb21e351f504c653c"
+SRC_URI += "git://github.com/containernetworking/cni;protocol=https;branch=main;rev=1d67f89a2e3cfc3c22da74d4f8490e65ca4a819c;name=git_4ce5ee0d_0;destsuffix=vcs_cache/a3d62a01a5bcbd383225f2636ba0f99154ca2a81b07aad16b9e30e1630ea00f6"
 SRC_URI += "git://github.com/pmezard/go-difflib;protocol=https;nobranch=1;rev=792786c7400a136282c1664665ae0a8db921c6c2;name=git_b66720d7_0;destsuffix=vcs_cache/c04ad296d2e3203fda8b7ca96feaca21b20b3b7441e33c7d67cda029ea61ab4c"
 SRC_URI += "git://github.com/davecgh/go-spew;protocol=https;nobranch=1;rev=8991bc29aa16c548c550c7ff78260e27b9ab7c73;name=git_d9a489aa_0;destsuffix=vcs_cache/4c7d69cfe586f86079773ff48d94f76d327c2914d8dfeffca9e34fd1146e5d5e"
 SRC_URI += "git://github.com/onsi/gomega;protocol=https;nobranch=1;shallow=1;rev=fa057b845528c9336265d6df77e21d827f268c7d;name=git_4f2954a0_0;destsuffix=vcs_cache/5d804844b09e94f5ebe51951fab8e7b49bdb61690fc0ffa035a4b0d39839fab2"
 SRC_URI += "git://github.com/onsi/ginkgo;protocol=https;nobranch=1;shallow=1;rev=4ef0afb9f28f241c352cad6ca9dae8b149e57bc4;name=git_209602b3_0;destsuffix=vcs_cache/250c6ed89fc0be4bae692e1c5f1f1e6828774d5a023a2a0844246ec3f2b52c01"
+SRC_URI += "git://github.com/russross/blackfriday;protocol=https;nobranch=1;shallow=1;rev=4c9bf9512682b995722660a4196c0013228e2049;name=git_fb978822_0;destsuffix=vcs_cache/6dd1604eceba1790dbf7f827f1e22a5866a5348a2ab616daed7363a6e16e081d"
 SRC_URI += "git://github.com/stretchr/testify;protocol=https;nobranch=1;shallow=1;rev=f97607b89807936ac4ff96748d766cf4b9711f78;name=git_aa93f7ee_0;destsuffix=vcs_cache/cec0eadb3ceb93408aae446eb0c115ea4a39cd4ba2048947ee55e1f8969c3872"
+SRC_URI += "git://github.com/inconshreveable/mousetrap;protocol=https;nobranch=1;shallow=1;rev=4e8053ee7ef85a6bd26368364a6d27f1641c1d21;name=git_b31cc6ad_0;destsuffix=vcs_cache/a9f0ac4cf05240ceb9790811cbd8ab3cbdcd404501a9ca5a402a28033e7235d8"
+SRC_URI += "git://github.com/cpuguy83/go-md2man;protocol=https;nobranch=1;shallow=1;rev=441631534462b74c098953dbd8d5f6210994b0bf;name=git_af686cb3_0;destsuffix=vcs_cache/0b9036af46cc50aa9433a461266e6ef3b3645807c3d1fa49cc53eb201e011781"
 SRC_URI += "git://go.googlesource.com/sys;protocol=https;nobranch=1;shallow=1;rev=aa1c4c8554e2f3f54247c309e897cd42c9bfc374;name=git_da0444fc_0;destsuffix=vcs_cache/ab1c9d8044ec55ff95f7d385c76150aeabf000c2a14bc1775a1766dd90f14cda"
 SRC_URI += "git://go.googlesource.com/mod;protocol=https;nobranch=1;shallow=1;rev=bc151c4e8ccc31931553c47d43e41c0efc246096;name=git_13df7481_0;destsuffix=vcs_cache/c837184171f2b9a408933cc7892b7ef003ef72a2d18747dc23c77f54fa57d62b"
 SRC_URI += "git://go.googlesource.com/term;protocol=https;nobranch=1;shallow=1;rev=d59895469ac1327e92a3ee0ecb6dd868315fcd74;name=git_2e975dd2_0;destsuffix=vcs_cache/5c601017bf1fc28cce196476ddd88d281c6d676e09ca5cb41e9b848278953afd"
@@ -42,12 +47,17 @@ BB_GIT_SHALLOW_EXTRA_REFS = "\
     refs/tags/v0.6.0 \
     refs/tags/v0.8.0 \
     refs/tags/v1.0.0 \
+    refs/tags/v1.0.6 \
+    refs/tags/v1.1.0 \
     refs/tags/v1.1.1 \
     refs/tags/v1.34.1 \
     refs/tags/v1.4.13 \
     refs/tags/v1.4.2 \
     refs/tags/v1.5.1 \
     refs/tags/v1.8.4 \
+    refs/tags/v1.9.1 \
+    refs/tags/v2.0.6 \
+    refs/tags/v2.1.0 \
     refs/tags/v2.20.1 \
     refs/tags/v3.0.0 \
     refs/tags/v3.0.1 \