Merge pull request #30 from gunjan5/crd-tests

Update to libcalico 1.6.0 + update FVs to use CRDs instead of TPRs

Makefile

@@ -6,7 +6,7 @@ all: clean test
 
 GO_BUILD_CONTAINER?=calico/go-build:v0.4
 
-K8S_VERSION=v1.6.4
+K8S_VERSION=v1.7.4
 ETCDCTL_VER=v3.1.8
 BIRD_VER=v0.3.1
 LOCAL_IP_ENV?=$(shell ip route get 8.8.8.8 | head -1 | awk '{print $$7}')

glide.yaml

@@ -2,7 +2,7 @@ package: github.com/kelseyhightower/confd
 import:
 - package: github.com/BurntSushi/toml
   version: 312db06c6c6dbfa9899e58564bacfaa584f18ab7
-- package: github.com/Sirupsen/logrus
+- package: github.com/sirupsen/logrus
   version: 3455d89ac9652295c85db2a98ea32f1d61c380bc
 - package: github.com/aws/aws-sdk-go
   version: 2a34ea8812f32aae75b43400f9424a0559840659
@@ -130,6 +130,7 @@ import:
 - package: gopkg.in/yaml.v2
   version: f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
 - package: github.com/projectcalico/libcalico-go
+  version: v1.6.0
   subpackages:
   - lib/backend/k8s
   - lib/backend/k8s/resources

log/log.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type ConfdFormatter struct {

tests/mock_data/kdd/explicit_peering/global/crd_data.yaml

@@ -0,0 +1,69 @@
+apiVersion: crd.projectcalico.org/v1
+kind: IPPool
+metadata:
+  name: 192-168-0-0-16
+spec:
+  ipip:
+    enabled: true
+    mode: always
+  natOutgoing: true
+  disabled: false
+  cidr: 192.168.0.0/16
+
+---
+
+apiVersion: crd.projectcalico.org/v1
+kind: GlobalFelixConfig
+metadata:
+  name: ipinipenabled
+spec:
+  name: IpInIpEnabled
+  value: "true"
+
+---
+
+apiVersion: v1
+kind: List
+items:
+- apiVersion: crd.projectcalico.org/v1
+  kind: GlobalBGPConfig
+  metadata:
+    name: asnumber
+  spec:
+    name: AsNumber
+    value: "64567"
+- apiVersion: crd.projectcalico.org/v1
+  kind: GlobalBGPConfig
+  metadata:
+    name: nodemeshenabled
+  spec:
+    name: NodeMeshEnabled
+    value: "false"
+- apiVersion: crd.projectcalico.org/v1
+  kind: GlobalBGPConfig
+  metadata:
+    name: loglevel
+  spec:
+    name: loglevel
+    value: debug
+
+
+---
+
+apiVersion: v1
+kind: List
+items:
+- apiVersion: crd.projectcalico.org/v1
+  kind: BGPPeer
+  metadata:
+    name: 10-192-0-3
+  spec:
+    peerIP: 10.192.0.3
+    asNumber: 64567
+- apiVersion: crd.projectcalico.org/v1
+  kind: BGPPeer
+  metadata:
+    name: 10-192-0-4
+  spec:
+    peerIP: 10.192.0.4
+    asNumber: 64567

tests/mock_data/kdd/explicit_peering/global/crds.yaml

@@ -0,0 +1,65 @@
+# Create all the CustomResourceDefinitions needed for
+# Calico policy and networking mode.
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+description: Calico Global Felix Configuration
+kind: CustomResourceDefinition
+metadata:
+   name: globalfelixconfigs.crd.projectcalico.org
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: GlobalFelixConfig
+    plural: globalfelixconfigs
+    singular: globalfelixconfig
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+description: Calico BGP Peers
+kind: CustomResourceDefinition
+metadata:
+  name: bgppeers.crd.projectcalico.org
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: BGPPeer
+    plural: bgppeers
+    singular: bgppeer
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+description: Calico Global BGP Configuration
+kind: CustomResourceDefinition
+metadata:
+  name: globalbgpconfigs.crd.projectcalico.org
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: GlobalBGPConfig
+    plural: globalbgpconfigs
+    singular: globalbgpconfig
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+description: Calico IP Pools
+kind: CustomResourceDefinition
+metadata:
+  name: ippools.crd.projectcalico.org
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: IPPool
+    plural: ippools
+    singular: ippool