diff --git a/go.mod b/go.mod index e9a29f5b7..14ab04f19 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/onsi/gomega v1.10.1 github.com/pkg/errors v0.9.1 github.com/projectcalico/cni-plugin v1.11.1-0.20210728184724-953cb91863f7 - github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e + github.com/projectcalico/felix v0.0.0-20210803211917-734ebf8a2d03 github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 - github.com/projectcalico/typha v0.7.3-0.20210723173402-d1d3d243ac33 + github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402 github.com/sirupsen/logrus v1.7.0 github.com/vishvananda/netlink v1.1.0 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 @@ -22,7 +22,7 @@ require ( replace ( github.com/Microsoft/hcsshim => github.com/projectcalico/hcsshim v0.8.9-calico - github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20210727201711-667c84f6a25c + github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20210803165501-7268348157c1 github.com/sirupsen/logrus => github.com/projectcalico/logrus v1.0.4-calico diff --git a/go.sum b/go.sum index 3993ef206..5ae12e647 100644 --- a/go.sum +++ b/go.sum @@ -630,29 +630,24 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/projectcalico/cni-plugin v1.11.1-0.20210728184724-953cb91863f7 h1:ziEWIVhrspaM2r90v4J9+l/QMqkSDowfJO9JaWqNxB8= github.com/projectcalico/cni-plugin v1.11.1-0.20210728184724-953cb91863f7/go.mod h1:7HLB23Orepx7msvr7CPj9P58IcqfOrBfxIFcHLxU6Y4= -github.com/projectcalico/confd v1.0.1-0.20210727201711-667c84f6a25c h1:JS5qwrZ2KRwkV29L/Dnlg89NhI2iANMRpB8Px/te55c= -github.com/projectcalico/confd v1.0.1-0.20210727201711-667c84f6a25c/go.mod h1:tKUJXbd8UxtU3IPw56uODEL+o3xKI30tE9714cLqw/A= -github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e h1:c1Vxq2OKlNHAvrRp97u6yfEgdgsdHcioM5SHP40mrWw= -github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e/go.mod h1:7I51jNvPMAadgGAOuVDksGhAhCG0TwpADs4hx8I58pM= +github.com/projectcalico/confd v1.0.1-0.20210803165501-7268348157c1 h1:1bUWsD8eMeBKDzMFNLbVIpTjSmktohd5kG21SxBlxMU= +github.com/projectcalico/confd v1.0.1-0.20210803165501-7268348157c1/go.mod h1:aHIalrcXgyzZPDge7AaKPYgeuzESPSLwUhqlXEJ1zh0= +github.com/projectcalico/felix v0.0.0-20210803211917-734ebf8a2d03 h1:1XvB2JsJnCFZQqW4fnRA4zB/kj67oJcy7UulHwThMDQ= +github.com/projectcalico/felix v0.0.0-20210803211917-734ebf8a2d03/go.mod h1:eZoAh3YTQo8i8yk7kB+Fj8nmgiitGZcwe4y3mOCHJeI= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba h1:aaF2byUCZhzszHsfPEr2M3qcU4ibtD/yk/il2R7T1PU= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba/go.mod h1:q8EdCgBdMQzgiX/uk4GXLWLk+gIHd1a7mWUAamJKDb4= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:Jt2Pic9dxgJisekm8q2WV9FaWxUJhhRfwHSP640drww= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/hcsshim v0.8.9-calico h1:aRrOWouDTzKwaIoRGMV/I1QikR+ikwj1G9T9h3wD090= github.com/projectcalico/hcsshim v0.8.9-calico/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= -github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d h1:0C8ZHSF4M5PGScqDIerfQxn4p8Oy32E7s+CxsBKmekI= -github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= -github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 h1:n89xz50uPXiTHWsVp3yKwmnREBEmKnaJ6CdNYLaUIu8= github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/logrus v1.0.4-calico h1:bHJ2KLGTFzoWpRISe13CO7HVxxrKunDjyUz/wFiBY8c= github.com/projectcalico/logrus v1.0.4-calico/go.mod h1:DfgrchabbtEO9wjOz5lVae+XRvjFKKWEA9GTMme6A8g= github.com/projectcalico/pod2daemon v0.0.0-20210416195010-6f2d574230b3 h1:FI93O4ZOPDZTySj971ayBc0ygGF/7/lEX4qciQcNjcs= github.com/projectcalico/pod2daemon v0.0.0-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca h1:SHkdVnz6/FLmn0M58XRw70W/ejz2gNxyr2lxXoSsbc0= -github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca/go.mod h1:PMyC8JmFiLIiSybiGzyFh0+lSseIn9PWRmTFuqfsD1E= -github.com/projectcalico/typha v0.7.3-0.20210723173402-d1d3d243ac33 h1:VpYKDc6FdKyai9JqfHOqVtsz/AX50+qH2YytuZ5FCjo= -github.com/projectcalico/typha v0.7.3-0.20210723173402-d1d3d243ac33/go.mod h1:+BT+wnWD38CWTRQIfrW5RHyMemsEqVzmYEdWyJ8slIQ= +github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402 h1:ULw+ZCb11brM+nUNkJQha0fehSc5xX2bRWC0La3cNkI= +github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402/go.mod h1:QphGM3APHauWRrNxzyLsHfw+opw0jKpx003sI2qwz8E= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=