Skip to content
This repository was archived by the owner on Oct 20, 2025. It is now read-only.

Commit 8a9d3b1

Browse files
caseydavenportcaseydavenport
authored
Merge pull request #1393 from caseydavenport/casey-v3.20-gobuild
Update go-build
2 parents 3e11a27 + 313e887 commit 8a9d3b1

14 files changed

Lines changed: 37 additions & 36 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PACKAGE_NAME?=github.com/projectcalico/node
2-
GO_BUILD_VER?=v0.54
2+
GO_BUILD_VER?=v0.65.1
33

44
ORGANIZATION=projectcalico
55
SEMAPHORE_PROJECT_ID?=$(SEMAPHORE_NODE_PROJECT_ID)
@@ -54,6 +54,9 @@ Makefile.common.$(MAKE_BRANCH):
5454

5555
include Makefile.common
5656

57+
# Override K8S_VERSION to last available hyperkube.
58+
K8S_VERSION = v1.18.6
59+
5760
###############################################################################
5861

5962
# Versions and location of dependencies used in the build.

‎cmd/calico-node/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
confdConfig "github.com/kelseyhightower/confd/pkg/config"
2323
confd "github.com/kelseyhightower/confd/pkg/run"
24+
2425
"github.com/projectcalico/node/pkg/nodeinit"
2526

2627
"github.com/sirupsen/logrus"

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require (
77
github.com/onsi/ginkgo v1.14.1
88
github.com/onsi/gomega v1.10.1
99
github.com/pkg/errors v0.9.1
10-
github.com/projectcalico/api v0.0.0-20220411213543-effb8939528e
11-
github.com/projectcalico/cni-plugin v1.11.1-0.20211201234630-150541d1c6c6
12-
github.com/projectcalico/felix v0.0.0-20220411230333-80bc4ac6a94d
13-
github.com/projectcalico/libcalico-go v1.7.2-0.20220411224106-e73d057e6c68
14-
github.com/projectcalico/typha v0.7.3-0.20220411224225-d1bd0f720abb
10+
github.com/projectcalico/api v0.0.0-20220412173007-91d7bea04e9e
11+
github.com/projectcalico/cni-plugin v1.11.1-0.20220418181454-27110d1d7240
12+
github.com/projectcalico/felix v0.0.0-20220412173052-2350d2ca1ae1
13+
github.com/projectcalico/libcalico-go v1.7.2-0.20220412173036-e9d17133c15c
14+
github.com/projectcalico/typha v0.7.3-0.20220418162914-e75cb03c4684
1515
github.com/sirupsen/logrus v1.7.0
1616
github.com/vishvananda/netlink v1.1.0
1717
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
@@ -23,7 +23,7 @@ require (
2323

2424
replace (
2525
github.com/Microsoft/hcsshim => github.com/projectcalico/hcsshim v0.8.9-calico
26-
github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20211201233523-02a5aae086f0
26+
github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20220418163814-9f1707a1ee9e
2727

2828
github.com/sirupsen/logrus => github.com/projectcalico/logrus v1.0.4-calico
2929

‎go.sum‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
343343
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
344344
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
345345
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
346-
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
347346
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
348347
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
349348
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -439,7 +438,6 @@ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22
439438
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
440439
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
441440
github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
442-
github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4 h1:nwOc1YaOrYJ37sEBrtWZrdqzK22hiJs3GpDmP3sR2Yw=
443441
github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
444442
github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
445443
github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
@@ -544,7 +542,6 @@ github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLt
544542
github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
545543
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
546544
github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
547-
github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg=
548545
github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
549546
github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
550547
github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
@@ -646,34 +643,31 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
646643
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
647644
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
648645
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
649-
github.com/projectcalico/api v0.0.0-20210812153050-d56d8a62d55f h1:SIzIwUwtGpC69Dc5tI3/p3Jy4nULpOxcT+Lr00NKo4w=
650-
github.com/projectcalico/api v0.0.0-20210812153050-d56d8a62d55f/go.mod h1:8raLpE2oURN0I33JpEniA3LmAs5uPZ1kGnW/YunYEB0=
651-
github.com/projectcalico/api v0.0.0-20220411213543-effb8939528e h1:eHJN1ndhes0D4CIiC4IieDF1U7EOYTXnNc4jBAtzNd0=
652646
github.com/projectcalico/api v0.0.0-20220411213543-effb8939528e/go.mod h1:8raLpE2oURN0I33JpEniA3LmAs5uPZ1kGnW/YunYEB0=
653-
github.com/projectcalico/cni-plugin v1.11.1-0.20211201234630-150541d1c6c6 h1:iDaqV1ilAuPZw7+69BBBDJh/2zkkU0X73gxXBiQjNts=
654-
github.com/projectcalico/cni-plugin v1.11.1-0.20211201234630-150541d1c6c6/go.mod h1:DaKkVjVCpO3jL112nQ+DxqMIvbLXhWuPh5ey9f/+j90=
655-
github.com/projectcalico/confd v1.0.1-0.20211201233523-02a5aae086f0 h1:ODfjkqliB9dFagcIeEb2hPnSOlKqEIAIngrMcgTKEOU=
656-
github.com/projectcalico/confd v1.0.1-0.20211201233523-02a5aae086f0/go.mod h1:hFxMMSXI6pWz1BfkTZk/r24xhn0kFB0z6B0qEqVC2wM=
657-
github.com/projectcalico/felix v0.0.0-20220411230333-80bc4ac6a94d h1:5w+OWPQ71ugSBBHbykXqrM3c/ZXgc8hg0jSQZjo9/cI=
658-
github.com/projectcalico/felix v0.0.0-20220411230333-80bc4ac6a94d/go.mod h1:wkB9Ovwr6mKZJXcgch+EIWdhFVe/gQsCvVgp+5HyvqI=
647+
github.com/projectcalico/api v0.0.0-20220412173007-91d7bea04e9e h1:/Ys+oj70EwX7a5EgCrPxmQO/p0kX+QhvfBRjxsdl3Ik=
648+
github.com/projectcalico/api v0.0.0-20220412173007-91d7bea04e9e/go.mod h1:8raLpE2oURN0I33JpEniA3LmAs5uPZ1kGnW/YunYEB0=
649+
github.com/projectcalico/cni-plugin v1.11.1-0.20220418181454-27110d1d7240 h1:de7hNwt/375dj60ocJYBfpT+x/kR86XxNiuZEONrmt8=
650+
github.com/projectcalico/cni-plugin v1.11.1-0.20220418181454-27110d1d7240/go.mod h1:6ykxRrF+z9JyNCJ/vA40ehAdNHTKDyYKDLxc1IcPn3c=
651+
github.com/projectcalico/confd v1.0.1-0.20220418163814-9f1707a1ee9e h1:dcfYD9Eie4nAssfd6Z+Ba239v6n9RCRbBEktoibXoQY=
652+
github.com/projectcalico/confd v1.0.1-0.20220418163814-9f1707a1ee9e/go.mod h1:sMDwGH0EFngAHoRgF0gA1ZiKly/dmf+CIUcLmXLYW24=
653+
github.com/projectcalico/felix v0.0.0-20220412173052-2350d2ca1ae1 h1:0FJgqqQJyWjsCpfog3oMnKtcByQOscWCSjzgoujVhMY=
654+
github.com/projectcalico/felix v0.0.0-20220412173052-2350d2ca1ae1/go.mod h1:wkB9Ovwr6mKZJXcgch+EIWdhFVe/gQsCvVgp+5HyvqI=
659655
github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba h1:aaF2byUCZhzszHsfPEr2M3qcU4ibtD/yk/il2R7T1PU=
660656
github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba/go.mod h1:q8EdCgBdMQzgiX/uk4GXLWLk+gIHd1a7mWUAamJKDb4=
661657
github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:Jt2Pic9dxgJisekm8q2WV9FaWxUJhhRfwHSP640drww=
662658
github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc=
663659
github.com/projectcalico/hcsshim v0.8.9-calico h1:aRrOWouDTzKwaIoRGMV/I1QikR+ikwj1G9T9h3wD090=
664660
github.com/projectcalico/hcsshim v0.8.9-calico/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
665-
github.com/projectcalico/libcalico-go v1.7.2-0.20211201231158-1f4f27eeea27 h1:UEi1MJOd+LX7tHvX9MVhJlgrBlgoFsEPINCk/0jTjHM=
666-
github.com/projectcalico/libcalico-go v1.7.2-0.20211201231158-1f4f27eeea27/go.mod h1:dwz/Jf2d7Vp5TDUPBVPhIjOgXzaJZq72M1ipKwOStiw=
667-
github.com/projectcalico/libcalico-go v1.7.2-0.20220411224106-e73d057e6c68 h1:2hQ4HNpCaTi7HHVFEbMb0FDpMABQ8ieb5KBRsUsdjCM=
668661
github.com/projectcalico/libcalico-go v1.7.2-0.20220411224106-e73d057e6c68/go.mod h1:b4dz5O1XRRMyVJfLP3uaDaaHZkJ77CRI71wb/10xhWA=
662+
github.com/projectcalico/libcalico-go v1.7.2-0.20220412173036-e9d17133c15c h1:hIpyPHxUuClZgKdl/toRLuClkW3a84ZkPDINflSZn9o=
663+
github.com/projectcalico/libcalico-go v1.7.2-0.20220412173036-e9d17133c15c/go.mod h1:b4dz5O1XRRMyVJfLP3uaDaaHZkJ77CRI71wb/10xhWA=
669664
github.com/projectcalico/logrus v1.0.4-calico h1:bHJ2KLGTFzoWpRISe13CO7HVxxrKunDjyUz/wFiBY8c=
670665
github.com/projectcalico/logrus v1.0.4-calico/go.mod h1:DfgrchabbtEO9wjOz5lVae+XRvjFKKWEA9GTMme6A8g=
671666
github.com/projectcalico/pod2daemon v0.0.0-20210816230834-b3a8b892d114 h1:HtV3Xp2R4jKbnye08zkD4NzUIyTxxtoO3dcyM72LrY4=
672667
github.com/projectcalico/pod2daemon v0.0.0-20210816230834-b3a8b892d114/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM=
673-
github.com/projectcalico/typha v0.7.3-0.20211201232643-a2e23bd8b2ae h1:VQ2nkKpdShQE1vn07OhpFMrlje7aJbj+LsAHJx+XzOA=
674-
github.com/projectcalico/typha v0.7.3-0.20211201232643-a2e23bd8b2ae/go.mod h1:N8YAxC731abGk8HmJ+1fP9dGuS+xcOyMQjH4oylVX14=
675-
github.com/projectcalico/typha v0.7.3-0.20220411224225-d1bd0f720abb h1:JgWrT3SJdRqVKzIL1d0RzxcALWJYmGi9PVWtSUm2wco=
676668
github.com/projectcalico/typha v0.7.3-0.20220411224225-d1bd0f720abb/go.mod h1:vs7lqHbcFAomvlYlqpUTrXQg72WV0azEHQAInJdWjWQ=
669+
github.com/projectcalico/typha v0.7.3-0.20220418162914-e75cb03c4684 h1:XE0dGpv8Q3io5jFeOO0WuONoOSmWx9zEOljLXfTsa6s=
670+
github.com/projectcalico/typha v0.7.3-0.20220418162914-e75cb03c4684/go.mod h1:LiZnvuYYQJ7J2X2S+IZkM4sXW0k1eI2L7F3jqzve6r4=
677671
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
678672
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
679673
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -838,7 +832,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
838832
golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
839833
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
840834
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
841-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
842835
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
843836
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
844837
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -929,7 +922,6 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
929922
golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
930923
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
931924
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
932-
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM=
933925
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
934926
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
935927
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -1016,7 +1008,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
10161008
golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10171009
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10181010
golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1019-
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
10201011
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10211012
golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10221013
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1033,7 +1024,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10331024
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10341025
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
10351026
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
1036-
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
10371027
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10381028
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
10391029
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -1101,7 +1091,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
11011091
golang.zx2c4.com/wireguard v0.0.0-20210927201915-bb745b2ea326/go.mod h1:SDoazCvdy7RDjBPNEMBwrXhomlmtG7svs8mgwWEqtVI=
11021092
golang.zx2c4.com/wireguard v0.0.20200121 h1:vcswa5Q6f+sylDfjqyrVNNrjsFUUbPsgAQTBCAg/Qf8=
11031093
golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4=
1104-
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200324154536-ceff61240acf h1:rWUZHukj3poXegPQMZOXgxjTGIBe3mLNHNVvL5DsHus=
11051094
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200324154536-ceff61240acf/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c=
11061095
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211027115401-c9b1ec1aa6d8 h1:5Qw4mAZBeNAX5ubJtVvzUmUJ/Zsl7wzwXRz8MrjYJaY=
11071096
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211027115401-c9b1ec1aa6d8/go.mod h1:G0zJhHaavrPDNb/ygHzf4uju6nSlKMi4f1E5RCT3WpE=
@@ -1247,7 +1236,6 @@ k8s.io/client-go v0.21.0-rc.0 h1:lsPZHT1ZniXJcwg2udlaTOhAT8wf7BE0rn9Vj0+LWMA=
12471236
k8s.io/client-go v0.21.0-rc.0/go.mod h1:zU5HY/bSOKH3YOqoge9nFvICgrpeSdJu8DQ4fkjKIZk=
12481237
k8s.io/cloud-provider v0.21.0-rc.0/go.mod h1:dXTEXZuesbZ0g2tXButYQlr5mVnQ6lmWGJyODVXKFTY=
12491238
k8s.io/cluster-bootstrap v0.21.0-rc.0/go.mod h1:lsAFz54QLO/Eg1o2FmI9EreB+nEpY8KWiXXCpyhjnsQ=
1250-
k8s.io/code-generator v0.21.0-rc.0 h1:5XqZwy0dHr3LssJ9ImpO8dCjdTvZ8Bw84b90dZ46kPk=
12511239
k8s.io/code-generator v0.21.0-rc.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
12521240
k8s.io/component-base v0.21.0-rc.0 h1:8YgFPDsIhRx7zCOxikZn77nYRnwxrc9aMiuQDJtK1+g=
12531241
k8s.io/component-base v0.21.0-rc.0/go.mod h1:XlP0bM7QJFWRGZYPc5NmphkvsYQ+o7804HWH3GTGjDY=
@@ -1256,7 +1244,6 @@ k8s.io/controller-manager v0.21.0-rc.0/go.mod h1:K9485cOofmSjHGwNod14iRhLjNU65/A
12561244
k8s.io/cri-api v0.21.0-rc.0/go.mod h1:nJbXlTpXwYCYuGMR7v3PQb1Du4WOGj2I9085xMVjr3I=
12571245
k8s.io/csi-translation-lib v0.21.0-rc.0/go.mod h1:oG3Gth9/qb2RPjhoqJIZSPTqNqDt/rZFSLShuntPb90=
12581246
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
1259-
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
12601247
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
12611248
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
12621249
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

‎pkg/allocateip/allocateip.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ func correctAllocationWithHandle(ctx context.Context, c client.Interface, addr,
374374
ipAddr := net.ParseIP(addr)
375375
if ipAddr == nil {
376376
log.Fatalf("Failed to parse node tunnel address '%s'", addr)
377+
return nil
377378
}
378379

379380
// Release the old allocation.

‎pkg/lifecycle/startup/autodetection/autodetection_suite_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/onsi/ginkgo/reporters"
10+
1011
"github.com/projectcalico/libcalico-go/lib/testutils"
1112
)
1213

‎pkg/lifecycle/startup/autodetection/filtered.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ import (
1818
"fmt"
1919
gnet "net"
2020

21-
"github.com/projectcalico/libcalico-go/lib/net"
2221
log "github.com/sirupsen/logrus"
22+
23+
"github.com/projectcalico/libcalico-go/lib/net"
2324
)
2425

2526
// FilteredEnumeration performs basic IP and IPNetwork discovery by enumerating

‎pkg/lifecycle/startup/autodetection/interfaces.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ import (
1818
"regexp"
1919
"strings"
2020

21-
cnet "github.com/projectcalico/libcalico-go/lib/net"
2221
log "github.com/sirupsen/logrus"
22+
23+
cnet "github.com/projectcalico/libcalico-go/lib/net"
2324
)
2425

2526
// Interface contains details about an interface on the host.

‎pkg/lifecycle/startup/autodetection/ipv4/poolselector.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
// Copyright (c) 2020 Tigera, Inc. All rights reserved.

‎pkg/lifecycle/startup/autodetection/ipv4/poolselector_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
// Copyright (c) 2020 Tigera, Inc. All rights reserved.

0 commit comments

Comments
 (0)