Skip to content

Commit

Permalink
update 1.32 cni plugin patch (#3530)
Browse files Browse the repository at this point in the history
* update 1.32 cni plugin patch

* update 1.32 cni plugin patch
  • Loading branch information
vineeth-bandi authored Jan 15, 2025
1 parent a17d580 commit 1499f0e
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 40 deletions.
72 changes: 36 additions & 36 deletions projects/containernetworking/plugins/1-32/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
8dcca2aca05633511938ae1cebf5128c25ec295c0cb768b72da8c075a9826bbc _output/1-32/bin/plugins/linux-amd64/bandwidth
35311b5c8275df6e9f744d4e84a56f68cdd719692f1953662357af910f2849c8 _output/1-32/bin/plugins/linux-amd64/bridge
8737aee3b3fef579645bb5026719e40c86b225c4c5a8cd469b3b4f03cc523529 _output/1-32/bin/plugins/linux-amd64/dhcp
696235aa1ace55a88a7dae0494979f15a00f0f5cfb07788d951313ca9114292b _output/1-32/bin/plugins/linux-amd64/dummy
f98a41a8de6fecb7b9e6973d97e34a533fcae6299fca21bf52d0c126bb2c5ab1 _output/1-32/bin/plugins/linux-amd64/firewall
4540e2f2a6e9095091053798daf92634e2a8df654056b294259818545432420e _output/1-32/bin/plugins/linux-amd64/host-device
3f6c1bab4ee17595cba34fc9f6ca0d572fc223fd06bbf61b01ba8354c6e54677 _output/1-32/bin/plugins/linux-amd64/host-local
f659e100ffcd8482643b6c9958fc35031e2a5811909b57ace66a5da42345675c _output/1-32/bin/plugins/linux-amd64/ipvlan
f17913a346cd928315d98c10b691b0e6e321a3c94ef6b1c05c308b07d46e6704 _output/1-32/bin/plugins/linux-amd64/loopback
810b994b582e6f239690b653404bdf6c32aca10c5064ef2e09483bae1bb6ee40 _output/1-32/bin/plugins/linux-amd64/macvlan
24b0c714fc1533452a6f9e2ef06cead2ea51819c12b2c16ce31b5c097c6b3c7c _output/1-32/bin/plugins/linux-amd64/portmap
cfbacb4805c2f37a75a88a559a5fda1d17765a3bb87d80e4b8a312fbfe64fab8 _output/1-32/bin/plugins/linux-amd64/ptp
b17b1bbded781edefcc67e32fb4efdb8f83e8ebf7b9ffbd041c35c7135ae35a4 _output/1-32/bin/plugins/linux-amd64/sbr
8407c141f31e96a50f6fdb51b9bca875e8d31146f1dc87d149e7bb150cfd92e2 _output/1-32/bin/plugins/linux-amd64/static
3057279b76a2efbe06a1e7b308dd6cb6abb8767b86cf9d3f939c4b18524c4f3e _output/1-32/bin/plugins/linux-amd64/tap
269486799c37e065928754420c9637f906da3eb3544ed4240f098ca21bf651f5 _output/1-32/bin/plugins/linux-amd64/tuning
2eb218e554909c1104509e79c28a181dfb8e731d7004126f5948f1fa94b48580 _output/1-32/bin/plugins/linux-amd64/vlan
6ebe4f7e302af256201cf06b50226ea712ea84fa2888145a1441b0ed0a8c2b76 _output/1-32/bin/plugins/linux-amd64/vrf
22691664a50189a497d62659abbe4ed8b9858aaf3c0e7adbc9d7010160df8b01 _output/1-32/bin/plugins/linux-arm64/bandwidth
ef0ef188861af5ad8c7a05789215589c45c5949a331d845447789e766a17baef _output/1-32/bin/plugins/linux-arm64/bridge
518da6d7103c17b563b7466820c5c5df7f77138c908f5f1a3266acf3c6c25bc3 _output/1-32/bin/plugins/linux-arm64/dhcp
3f8731aca6367af6367d73c0147fb9fac6b1c456e9e5e92450aeaa85cd2f99bd _output/1-32/bin/plugins/linux-arm64/dummy
d4dd57d43e5eff77b7e7257b581c45b0cd8a66039a845a990953aba7193e57e8 _output/1-32/bin/plugins/linux-arm64/firewall
04c3dfcbe0547783fbf9dce417e2c0cec866bdc16e7c4488f100305c76b488d0 _output/1-32/bin/plugins/linux-arm64/host-device
32f1cf3f85f92e08da93b6e79f639c3d194087d8990012396046208bc74de642 _output/1-32/bin/plugins/linux-arm64/host-local
ee7d1b1bee4f03f8b994b5d6c096fac94716b85a875ae8c9f2b8058103709f4b _output/1-32/bin/plugins/linux-arm64/ipvlan
22e853390891b548d96a07f08f7560d6d7a0d112d398905f8856b24bf4bd0cfb _output/1-32/bin/plugins/linux-arm64/loopback
9f72ee24597a574148ac6b755f956e470cd86510a682cc59513b7d7ba3fd4899 _output/1-32/bin/plugins/linux-arm64/macvlan
740fdb77fff650b180b83e0b36719b70025c88ae7e5157a9dd00005ad7ddde08 _output/1-32/bin/plugins/linux-arm64/portmap
eafaea0f4de95c246f4ed13b6e30002fe514fcd13586c03c2550b5b7b3d135e4 _output/1-32/bin/plugins/linux-arm64/ptp
67a0867b40311d4afaafac50bc5cf61eec5c15b50dc1c3c5d39ff13795be6124 _output/1-32/bin/plugins/linux-arm64/sbr
fbe1b196bc3e5d25d7e9b676dd5f0a3d246a7c336db42e199a801a193c341fbf _output/1-32/bin/plugins/linux-arm64/static
552bae5cebee49b49a2315a0620ae551ba4855b9df56556f8a2bef83675a06fc _output/1-32/bin/plugins/linux-arm64/tap
c3d0b6f6350e4e9b366acc473bd59dd50fd3ad941382483d0082e13a065826b5 _output/1-32/bin/plugins/linux-arm64/tuning
2b43aef6b1ded8f31a1c063d6c610f030d79ae3d3e69a7a4e1e44d9fce36a97f _output/1-32/bin/plugins/linux-arm64/vlan
6dbc354c06e4c124d471c7006a654f911f64fe32efdc4b7985a141e0cb11cf68 _output/1-32/bin/plugins/linux-arm64/vrf
bcbf34a523bc0d7089f1c4b917bb6230bb95defb343f68c28715cdf7e200159c _output/1-32/bin/plugins/linux-amd64/bandwidth
5f721f64ce21cc43af6420a09e475d77dbf6dc2eb458e353ccf82809400e9c88 _output/1-32/bin/plugins/linux-amd64/bridge
3334876f7900cc117cab528be89a1f4787fa7edd2e9ac16b0735d9b77dfa4c5c _output/1-32/bin/plugins/linux-amd64/dhcp
36827b1c0c367b4700dca5099598d6747aa9006283d67e34dd22b297ab73c2b8 _output/1-32/bin/plugins/linux-amd64/dummy
6cad0b5a0196fcd7778817b2d3a9a6025ec21343e524442057e8d75757017a9e _output/1-32/bin/plugins/linux-amd64/firewall
109ab617c7c06e0f7590400716ebc58625f18726924a75c3ae0abcb26893e3cd _output/1-32/bin/plugins/linux-amd64/host-device
c7943d545f24d470b859932243322bf37945d5b65f263c53b120db7451b1f837 _output/1-32/bin/plugins/linux-amd64/host-local
7fa399641be5b6f807689f766694f432f3045643632e7d69ce6b349d56a17e15 _output/1-32/bin/plugins/linux-amd64/ipvlan
4078ed12de9f1ffa444a2f71ce9b437522ef6ade06d0e60629918f35b65dfcd2 _output/1-32/bin/plugins/linux-amd64/loopback
301aeb4889fc1ea2aec3c4e139e43624a7dfa3688b44496beeb4687d84e8c2c1 _output/1-32/bin/plugins/linux-amd64/macvlan
61a72746b20f5f9032b8d88d6b553b7e45953621b22591afc3613c7d13a1f66f _output/1-32/bin/plugins/linux-amd64/portmap
4e7f73868637663014d1c31a8d805e0477b794a7ad2b24a449e7bc1dd3974db0 _output/1-32/bin/plugins/linux-amd64/ptp
720162c0ac4dd2496cf2b639c3a8f003dc750d3516ec80dc9e740e2c19b377f6 _output/1-32/bin/plugins/linux-amd64/sbr
e41e15c3b9d540ea9169c6844c7c24b3b59d963cacdeb7cae51fbcc026f92b41 _output/1-32/bin/plugins/linux-amd64/static
698726820c82e8ae4d31ddc18c21d8dfb93350829b7712d75f71ee3b6ebcadde _output/1-32/bin/plugins/linux-amd64/tap
dc0efe88ee2486f1ba4920d4d072912706e518cc37574aa7cf79e9d3d9b6fe5a _output/1-32/bin/plugins/linux-amd64/tuning
605afef8947bb63900c4541b500b141ab688d9069076040d5fe0e3842f0fbf0c _output/1-32/bin/plugins/linux-amd64/vlan
ab5d4bbe12261e050f5f74469fb8b03ee2de4acfc9735bd0ab5c89d6b29be484 _output/1-32/bin/plugins/linux-amd64/vrf
71e91197dcb1e48939d084b8014ebcca9518ce76d68678f38178fec8e1615b6b _output/1-32/bin/plugins/linux-arm64/bandwidth
a9c1da0176dcb57d70dd1eb834695c461d4051c7e9f298e2efdd4fa03edb4b58 _output/1-32/bin/plugins/linux-arm64/bridge
2576140109000711e4c01991c02de8375a8e29f55d9cc6b0f75e64ef4c7c23d5 _output/1-32/bin/plugins/linux-arm64/dhcp
adab3595a8bda6b37c3299a49e718d100b33cb2b5cb2e9be9f921639f3d25cef _output/1-32/bin/plugins/linux-arm64/dummy
80d1afaccd8c7e9ae9b669cfc26003068154af8d84835674c25edcbb8598b0ff _output/1-32/bin/plugins/linux-arm64/firewall
a353615cef8ee9315115bd2550ac221037d70602b7de6fb6fd0ecec4f26d04f5 _output/1-32/bin/plugins/linux-arm64/host-device
dc037876ea9a743e417c215d6e0bbfca69253e31d7b2feae16fcf2553a043924 _output/1-32/bin/plugins/linux-arm64/host-local
18495ca09f649fa55c85cc1b3a2772e5d34364d0680c98478195bc4fa5afbdf2 _output/1-32/bin/plugins/linux-arm64/ipvlan
a57f4bbdcd38c561267512aa0611a7e5c2c2553eeb3994402f23ec117e11462c _output/1-32/bin/plugins/linux-arm64/loopback
7286d47e4e1acf915cd9fc8dccfae48a96308fc9799ea0ec8ba0afb86effe4e6 _output/1-32/bin/plugins/linux-arm64/macvlan
9b42fb988989eb6b08e19ababcc09879d3320092ab76e0fe58c7c1518672eca3 _output/1-32/bin/plugins/linux-arm64/portmap
6cd8e59a5458354e44e0023a4910b0c8fa80fb5135a0cbad23287b90531e49d1 _output/1-32/bin/plugins/linux-arm64/ptp
07e48fafbf3624ee7f8849215f478c7a44dad40998f2371d81394ba98ab0fad9 _output/1-32/bin/plugins/linux-arm64/sbr
28355d62047bb7e92c64de40f10084453563bc85751a61133b5f25801680394d _output/1-32/bin/plugins/linux-arm64/static
8a1702d72cf864df26344081037a31f18d3d108e64b90b79a917dbb8af09795c _output/1-32/bin/plugins/linux-arm64/tap
ef4d6989e0882a7dac08ec38ed3fcaa292e30ee1bb6ec3da01b45a026e4da9fe _output/1-32/bin/plugins/linux-arm64/tuning
fc7848ffac86756ae0f81d136bcd7c855513c83086ffdda825b125f8efafa405 _output/1-32/bin/plugins/linux-arm64/vlan
9efbb0527cb1629f827945c55b8d8407b2104af390dcd92c69f93efde08267c0 _output/1-32/bin/plugins/linux-arm64/vrf
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Jun 17 00:00:00 2024
From: Mahesh <mahakagi@amazon.com>
Date: Mon, 17 Jun 2024 20:17:20 -0700
Subject: [PATCH] --EKS-PRIVATE-- Bump go directive for tag 1.5.1 to fix go dependency download
From: Vineeth Bandi <banvinee@amazon.com>
Date: Tue, 14 Jan 2025 11:52:26 -0600
Subject: [PATCH] Bump go directive for tag 1.5.1 to fix go dependency download

Description:
This patch addresses the issue in cni-plugins-1-32-presubmit.
The upstream tag 1.5.1 specifies a go directive version of 1.20, which causes go mod vendor to fail while downloading dependencies.
To resolve this, the go directive is updated to 1.21 which has been verified after running 'go mod tidy'.
While we are using same Go version 1.22, consistent with the upstream, the upstream build uses 1.22-alpine. Our build process does not use Alpine, making this the difference in causing our build to fail.
Expand Down

0 comments on commit 1499f0e

Please sign in to comment.