Merge pull request #68 from fasaxc/v2.6.x-rev-libcal

Calico 2.6.x: Rev libcalico-go to v1.7.2 and go-build to v0.8.
projectcalico · Nov 24, 2017 · a40e896 · a40e896
2 parents 54793f9 + fd7f193
commit a40e896
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ ARCH?=amd64
 
 ifeq ($(ARCH),amd64)
 	ARCHTAG?=
-	GO_BUILD_VER?=v0.4
+	GO_BUILD_VER?=v0.8
 endif
 
 ifeq ($(ARCH),ppc64le)

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -130,7 +130,7 @@ import:
 - package: gopkg.in/yaml.v2
   version: f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
 - package: github.com/projectcalico/libcalico-go
-  version: v1.7.0
+  version: v1.7.2
   subpackages:
   - lib/backend/k8s
   - lib/backend/k8s/resources

diff --git a/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg b/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg
@@ -15,7 +15,7 @@ filter calico_ipip {
 
   if ( net ~ 192.168.0.0/16 ) then {
 
-    if ( from ~ 10.192.0.0/16 ) then
+    if ( bgp_next_hop ~ 10.192.0.0/16 ) then
       krt_tunnel = "";                     
     else
       krt_tunnel = "tunl0";       

diff --git a/tests/utils.sh b/tests/utils.sh
@@ -73,7 +73,7 @@ get_templates() {
     repo_dir="/node-repo"
     if [ ! -d ${repo_dir} ]; then
         echo "Getting latest confd templates from calico repo"
-        git clone https://github.com/projectcalico/calico.git ${repo_dir}
+        git clone https://github.com/projectcalico/calico.git --branch=v2.6.x-series ${repo_dir}
         ln -s ${repo_dir}/calico_node/filesystem/etc/calico/ /etc/calico
     fi
 }

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const Version = "v0.12.1-calico-0.3.0"
+const Version = "v0.12.1-calico-0.4.1"