Merge pull request #69 from bcreane/rev-libcalico-go

rev libcalico-go to v1.7.3

Makefile

@@ -136,6 +136,9 @@ bin/bird6:
 bin/etcdctl:
 	curl -sSf -L --retry 5  https://github.com/coreos/etcd/releases/download/$(ETCD_VER)/etcd-$(ETCD_VER)-linux-$(ARCH).tar.gz | tar -xz -C bin --strip-components=1 etcd-$(ETCD_VER)-linux-$(ARCH)/etcdctl 
 
+container:
+	@echo success!
+
 .PHONY: clean
 clean:
 	rm -rf bin/*

glide.yaml

@@ -130,7 +130,7 @@ import:
 - package: gopkg.in/yaml.v2
   version: f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
 - package: github.com/projectcalico/libcalico-go
-  version: v1.7.2
+  version: v1.7.3
   subpackages:
   - lib/backend/k8s
   - lib/backend/k8s/resources

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 ( bgp_next_hop ~ 10.192.0.0/16 ) then
+    if defined(bgp_next_hop) && ( bgp_next_hop ~ 10.192.0.0/16 ) then
       krt_tunnel = "";                     
     else
       krt_tunnel = "tunl0";       

tests/test_suite_kdd.sh

@@ -16,7 +16,7 @@ for test in "${TESTS_TO_RUN[@]}"; do
     if ! . ${script_dir}/test_kdd.sh ${test}; then
         success=1
     fi
-    clean_kdd
+    clean_kdd ${test}
 done
 
-exit ${success}
+exit ${success}

tests/utils.sh

@@ -63,9 +63,9 @@ populate_kdd() {
 clean_kdd() {
     echo "Cleaning out k8s API"
     to_remove=$1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/crd_data.yaml > /dev/null 2>&1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/crds.yaml > /dev/null 2>&1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/nodes.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/crd_data.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/crds.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/nodes.yaml > /dev/null 2>&1
 }
 
 # get_templates attempts to grab the latest templates from the calico repo