Merge pull request #964 from projectcalico/semaphore-auto-pin-updates…

…-release-v3.18

[release-v3.18] Semaphore Auto Pin Update

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.20210324173925-b83c88879f4b
-	github.com/projectcalico/felix v0.0.0-20210420155105-1acc8df09aca
-	github.com/projectcalico/libcalico-go v1.7.2-0.20210421171937-2f705b2fc917
-	github.com/projectcalico/typha v0.7.3-0.20210408200656-3c8dd696a089
+	github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d
+	github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea
+	github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e
 	github.com/sirupsen/logrus v1.4.2
 	github.com/vishvananda/netlink v1.1.0
 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
@@ -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.20210408201434-4f765960bea1
+	github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1
 
 	github.com/sirupsen/logrus => github.com/projectcalico/logrus v1.0.4-calico
 

go.sum

@@ -571,10 +571,10 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY
 github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
 github.com/projectcalico/cni-plugin v1.11.1-0.20210324173925-b83c88879f4b h1:vtKiaXmzFJtuwMKHhcLd+MwHJifqElG1X7kL4qVrlSM=
 github.com/projectcalico/cni-plugin v1.11.1-0.20210324173925-b83c88879f4b/go.mod h1:vydp8yWSe6tbGKNv6RVI7eNSWw0FYqP0Xbz9VFv52ho=
-github.com/projectcalico/confd v1.0.1-0.20210408201434-4f765960bea1 h1:l7BzBt5He3ZCSzYjckqucBp1IGfg5dZ+vMOcy2M6TKo=
-github.com/projectcalico/confd v1.0.1-0.20210408201434-4f765960bea1/go.mod h1:Z9erP7XoeszGg6uRntASr5hpKr7LnkD2t+MIdJ5uJ8c=
-github.com/projectcalico/felix v0.0.0-20210420155105-1acc8df09aca h1:l8xugHWdZd1VU2Nq9Revp6/+12wKDudtkRdr6nF/g98=
-github.com/projectcalico/felix v0.0.0-20210420155105-1acc8df09aca/go.mod h1:YFTAzRobjiJ+1FtxpNBVXLwrSExXsmLQQa+edpTVF3g=
+github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1 h1:KGQo5U7RsxuroEuTxZl/JRLvVMZGOy1HSUoOo4OSOYQ=
+github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1/go.mod h1:03oWrc3VpkaPZ02FCfceHIIivc68ta3NbLxrU0888EU=
+github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d h1:OgMdZh5ddXkNev6HKMuuQjhZo3NLBi28HhuKNi9PiCE=
+github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d/go.mod h1:K0Ut3FZBrbmvUj9NssMkIF9r5GEYp70yp4r4tYjQBQ8=
 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=
@@ -583,16 +583,14 @@ github.com/projectcalico/hcsshim v0.8.9-calico h1:aRrOWouDTzKwaIoRGMV/I1QikR+ikw
 github.com/projectcalico/hcsshim v0.8.9-calico/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
 github.com/projectcalico/libcalico-go v1.7.2-0.20210316183306-4736940b112c h1:WpDEamDshXcIpeNw9AKDlz5D3/v1EdUeU162+tfYn6M=
 github.com/projectcalico/libcalico-go v1.7.2-0.20210316183306-4736940b112c/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM=
-github.com/projectcalico/libcalico-go v1.7.2-0.20210408194917-1dd6c96abd7a h1:OZD293BKO4yxG3OK8kyacZTHM2WkpnBjPcQkKO8i/JY=
-github.com/projectcalico/libcalico-go v1.7.2-0.20210408194917-1dd6c96abd7a/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM=
-github.com/projectcalico/libcalico-go v1.7.2-0.20210421171937-2f705b2fc917 h1:/WMNeuhIDTqMbnRc5Y9tLwKuRfZ9t5q3q0WRYXgGZpQ=
-github.com/projectcalico/libcalico-go v1.7.2-0.20210421171937-2f705b2fc917/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM=
+github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea h1:r+d8Jg/07nSqJf06Cs8oFT1FZDQR4bGaPiyPl7pWq/8=
+github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM=
 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-20210303175725-63bffe4262de h1:jZwDXT5zBIZ21mtqdE76ArjhBwl5G4T+aoBjgkivvjk=
 github.com/projectcalico/pod2daemon v0.0.0-20210303175725-63bffe4262de/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM=
-github.com/projectcalico/typha v0.7.3-0.20210408200656-3c8dd696a089 h1:cvOtIDa7kMammL+7gpMpZbXn1daEedQob+btfPNNLPA=
-github.com/projectcalico/typha v0.7.3-0.20210408200656-3c8dd696a089/go.mod h1:HM6wGYXF7+371gE6cHzVkbV8n4rGkoY1YWkYqCFx984=
+github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e h1:YU4O4F+6idxulkoTntdvZvpF0AiCzXZpllhGZamMUjc=
+github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e/go.mod h1:fkjCYYho25MbQML4pxDJ72MFrDEWppc1up57UhnNZQ0=
 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=