Merge pull request #1027 from bcreane/release-v2.5.0

Update to confd-v0.12.1-calico-0.3.0 for v2.5.0-rc2

_data/versions.yml

@@ -926,6 +926,49 @@ master:
 
 v2.5:
 
+- title: v2.5.0-rc2
+  note: |
+    17 August 2017
+
+    Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
+
+  components:
+    felix:
+      version: 2.5.0-rc1
+      url: https://github.com/projectcalico/felix/releases/tag/2.5.0-rc1
+    typha:
+      version: v0.4.0
+      url: https://github.com/projectcalico/typha/releases/tag/v0.4.0
+    calicoctl:
+      version: v1.5.0-rc1
+      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.5.0-rc1
+      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.5.0-rc1/calicoctl
+    calico/node:
+      version: v2.5.0-rc2
+    calico/cni:
+      version: v1.10.0
+      url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.10.0
+      download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico
+      download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico-ipam
+    calico-bird:
+      version: v0.3.1
+      url: https://github.com/projectcalico/calico-bird/releases/tag/v0.3.1
+    calico-bgp-daemon:
+      version: v0.2.1
+      url: https://github.com/projectcalico/calico-bgp-daemon/releases/tag/v0.2.1
+    libnetwork-plugin:
+      version: v1.1.0
+      url: https://github.com/projectcalico/libnetwork-plugin/releases/tag/v1.1.0
+    calico/kube-policy-controller:
+      version: v0.7.0
+      url: https://github.com/projectcalico/k8s-policy/releases/tag/v0.7.0
+    networking-calico:
+      version: 1.4.2
+      url: http://git.openstack.org/cgit/openstack/networking-calico/commit/?h=1.4.2
+    calico/routereflector:
+      version: v0.4.0
+      url: ""
+
 - title: v2.5.0-rc1
   note: |
     15 August 2017

calico_node/Makefile

@@ -21,7 +21,7 @@ TYPHA_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREA
 K8S_POLICY_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/kube-policy-controller.version')
 CNI_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/cni.version')
 # TODO - Why isn't confd in versions.yaml
-CONFD_VER ?= v0.12.1-calico0.2.0
+CONFD_VER ?= v0.12.1-calico-0.3.0
 
 SYSTEMTEST_CONTAINER_VER ?= latest
 # we can use "custom" build image and test image name