Merge pull request #49 from robbrockbank/rev-versions

Rev libcalico-go and calicoctl versions for v3.0.0-alpha1-rc2
projectcalico · Oct 21, 2017 · ef4632d · ef4632d
2 parents 198eddb + 09253e4
commit ef4632d
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ all: clean test
 
 GO_BUILD_CONTAINER?=calico/go-build$(ARCHTAG):$(GO_BUILD_VER)
 
-CALICOCTL_VER=v2.0.0-alpha1-rc1
+CALICOCTL_VER=v2.0.0-alpha1-rc2
 K8S_VERSION=v1.8.1
 ETCD_VER=v3.2.5
 BIRD_VER=v0.3.1

diff --git a/RELEASING.md b/RELEASING.md
@@ -11,6 +11,9 @@ and ensure tests pass and merge.
 
 You should have no local changes and tests should be passing.
 
+Verify that the versions of calicoctl etc. at the top of the Makefile are correct, and that
+glide has been revved to the appropriate version of libcalico-go.
+
 ## Creating the release
 1. `make clean && make`
 2. Tag the release and push the tag

diff --git a/glide.lock b/glide.lock
diff --git a/tests/mock_data/calicoctl/explicit_peering/global/delete.yaml b/tests/mock_data/calicoctl/explicit_peering/global/delete.yaml
@@ -24,7 +24,6 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
 
diff --git a/tests/mock_data/calicoctl/explicit_peering/global/input.yaml b/tests/mock_data/calicoctl/explicit_peering/global/input.yaml
@@ -65,7 +65,6 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
 
diff --git a/tests/mock_data/calicoctl/explicit_peering/specific_node/delete.yaml b/tests/mock_data/calicoctl/explicit_peering/specific_node/delete.yaml
@@ -26,7 +26,6 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
 
diff --git a/tests/mock_data/calicoctl/explicit_peering/specific_node/input.yaml b/tests/mock_data/calicoctl/explicit_peering/specific_node/input.yaml
@@ -35,8 +35,7 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
 
 ---

diff --git a/tests/mock_data/calicoctl/mesh/ipip-always/delete.yaml b/tests/mock_data/calicoctl/mesh/ipip-always/delete.yaml
@@ -4,6 +4,5 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
diff --git a/tests/mock_data/calicoctl/mesh/ipip-always/input.yaml b/tests/mock_data/calicoctl/mesh/ipip-always/input.yaml
@@ -42,6 +42,5 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Always
+  ipipMode: Always
   natOutgoing: true
diff --git a/tests/mock_data/calicoctl/mesh/ipip-cross-subnet/delete.yaml b/tests/mock_data/calicoctl/mesh/ipip-cross-subnet/delete.yaml
@@ -4,7 +4,6 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: CrossSubnet
+  ipipMode: CrossSubnet
   natOutgoing: true
 
diff --git a/tests/mock_data/calicoctl/mesh/ipip-cross-subnet/input.yaml b/tests/mock_data/calicoctl/mesh/ipip-cross-subnet/input.yaml
@@ -44,7 +44,6 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: CrossSubnet
+  ipipMode: CrossSubnet
   natOutgoing: true
 
diff --git a/tests/mock_data/calicoctl/mesh/ipip-off/delete.yaml b/tests/mock_data/calicoctl/mesh/ipip-off/delete.yaml
@@ -4,6 +4,5 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Off
+  ipipMode: Never
   natOutgoing: true
diff --git a/tests/mock_data/calicoctl/mesh/ipip-off/input.yaml b/tests/mock_data/calicoctl/mesh/ipip-off/input.yaml
@@ -43,6 +43,5 @@ metadata:
   name: ippool-1
 spec:
   cidr: 192.168.0.0/16
-  ipip:
-    mode: Never
+  ipipMode: Never
   natOutgoing: true
diff --git a/tests/test_suite_common.sh b/tests/test_suite_common.sh
@@ -167,8 +167,6 @@ download_templates_from_calico() {
         git clone https://github.com/projectcalico/calico.git ${repo_dir}
         ln -s ${repo_dir}/calico_node/filesystem/etc/calico/ /etc/calico
     fi
-    #TODO remove one this is in master
-    cd $repo_dir; git checkout v3.0-integration; git pull origin v3.0-integration; cd -
 }
 
 build_tomls_for_node() {

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const Version = "v1.0.0-alpha1-rc1"
+const Version = "v1.0.0-alpha1-rc2"