Skip to content

Commit

Permalink
Update felix pin (#562)
Browse files Browse the repository at this point in the history 
* Update felix pin

* Update pins

Co-authored-by: Laurence Man <[email protected]>
  • Loading branch information
@song-jiang @lmm
song-jiang and lmm authored Aug 26, 2020
1 parent 847a9ac commit 4c4d2d1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ require (
github.com/onsi/gomega v1.9.0
github.com/pkg/errors v0.9.1
github.com/projectcalico/cni-plugin v1.11.1-0.20200819094939-dc51a5d3b132
github.com/projectcalico/felix v0.0.0-20200826011811-4fd7f7fafbce
github.com/projectcalico/libcalico-go v1.7.2-0.20200819085920-305840c3e251
github.com/projectcalico/typha v0.7.3-0.20200825224049-ff1a0241fb55
github.com/projectcalico/felix v0.0.0-20200826182111-dafee87b314d
github.com/projectcalico/libcalico-go v1.7.2-0.20200826163149-61ccd4ec000a
github.com/projectcalico/typha v0.7.3-0.20200826172322-3c3aa6d8c30d
github.com/sirupsen/logrus v1.4.2
github.com/vishvananda/netlink v1.0.1-0.20181108222139-023a6dafdcdf
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
Expand All @@ -23,7 +23,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.20200825230508-ab8457980827
github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20200826174242-b0c9f0e7bef1

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

Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,14 +554,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
github.com/projectcalico/cni-plugin v1.11.1-0.20200819091010-b21a70baf7fb h1:MXHM576NtFSZZ83ApcY3vm2iEz1JH3dtmWTExSm0n1s=
github.com/projectcalico/cni-plugin v1.11.1-0.20200819091010-b21a70baf7fb/go.mod h1:qhri2DVx491AgL9Zs5diGb1nv0DQ31j59lhasnRLm58=
github.com/projectcalico/cni-plugin v1.11.1-0.20200819094939-dc51a5d3b132 h1:nd/vS4YPS/pGwEKAY5duNQZ1KEjmLyqlC86MwnAvK5Q=
github.com/projectcalico/cni-plugin v1.11.1-0.20200819094939-dc51a5d3b132/go.mod h1:qhri2DVx491AgL9Zs5diGb1nv0DQ31j59lhasnRLm58=
github.com/projectcalico/confd v1.0.1-0.20200825230508-ab8457980827 h1:01K1fukZfVG0JlV3MViBeUiQrC0TfUOVAB4pP0v7GGM=
github.com/projectcalico/confd v1.0.1-0.20200825230508-ab8457980827/go.mod h1:ZMQrb4jvP1zrHMm2Jx3QhUpAKhlOrnm0s009pYEXkLA=
github.com/projectcalico/felix v0.0.0-20200826011811-4fd7f7fafbce h1:Lcvd22QPJcbTU2mFs+3ZdQG6fV/JI7VS/m5OAeKyMuQ=
github.com/projectcalico/felix v0.0.0-20200826011811-4fd7f7fafbce/go.mod h1:dAcwP1DnbEuMk+z+bqwvgzFu8ltHpQvj5GH0juHhnhs=
github.com/projectcalico/confd v1.0.1-0.20200826174242-b0c9f0e7bef1 h1:gzjRvzVwtVQIxH4sJvTeXnINvVp8f4dabz2jHYBVha0=
github.com/projectcalico/confd v1.0.1-0.20200826174242-b0c9f0e7bef1/go.mod h1:zuZw93WKjOi8sJl+YxiiL67fkoiIbPeY+38pPgoguME=
github.com/projectcalico/felix v0.0.0-20200826182111-dafee87b314d h1:5iOJOrUL3afFN0ZuJ265HAnZAoVisDAm3yEPFQO18PU=
github.com/projectcalico/felix v0.0.0-20200826182111-dafee87b314d/go.mod h1:hRZacH5/hKViSgoj6gnBbk/mjYzIAWlNYQyJCRY6r0U=
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=
Expand All @@ -570,12 +568,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.20200819085920-305840c3e251 h1:/IRoW7kdHpGY0bzbRjOMDbL7FGDi3XRJfpxG63Drbo0=
github.com/projectcalico/libcalico-go v1.7.2-0.20200819085920-305840c3e251/go.mod h1:+HQmSvCZc2MCvkgOm1tn0zAkpJikDhvhcRcAiavLYtg=
github.com/projectcalico/libcalico-go v1.7.2-0.20200826163149-61ccd4ec000a h1:elwetCNH3FgYVwOhumAJtfMAIgAVMDCQ3IBGXuN6w+k=
github.com/projectcalico/libcalico-go v1.7.2-0.20200826163149-61ccd4ec000a/go.mod h1:+HQmSvCZc2MCvkgOm1tn0zAkpJikDhvhcRcAiavLYtg=
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-20200729161441-0e9320f4f3b4 h1:wVQ0qP1XyZzXLtm77qFecTZjTmjsmuao9YUAAleMwTU=
github.com/projectcalico/pod2daemon v0.0.0-20200729161441-0e9320f4f3b4/go.mod h1:bmtxGPEug34TbG/rPrGdPGt/ewR2OBksgA7P9TPKHIk=
github.com/projectcalico/typha v0.7.3-0.20200825224049-ff1a0241fb55 h1:SQVhRwkDnmESMP5pFoq11tjM9dEJVcXhkejB7Mi558k=
github.com/projectcalico/typha v0.7.3-0.20200825224049-ff1a0241fb55/go.mod h1:C/3jvfTECG2+fYLDjuvryb0C46QVUCcfOsfz1HLRNlI=
github.com/projectcalico/typha v0.7.3-0.20200826172322-3c3aa6d8c30d h1:rrLn6cRAfAApSDUCsLH+7D3MONm4bI/iGJnwUrmgX3o=
github.com/projectcalico/typha v0.7.3-0.20200826172322-3c3aa6d8c30d/go.mod h1:/X4uTAcNfnIf7SmECrl2OmfSnh1CSK6FUZjwBx2yRQI=
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=
Expand Down

0 comments on commit 4c4d2d1

Please sign in to comment.