Skip to content

Commit

Permalink
Merge pull request #1146 from bcreane/release-2.6.0
Browse files Browse the repository at this point in the history 
Release 2.6.0
  • Loading branch information
@ozdanborne
ozdanborne authored Sep 28, 2017
2 parents 4f05d90 + 8194cb1 commit 166d0de
Show file tree
Hide file tree
Showing 285 changed files with 334 additions and 293 deletions.
328 changes: 185 additions & 143 deletions _data/versions.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,188 @@
v2.6:
- title: v2.6.0
note: |
28 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0
url: https://github.com/projectcalico/felix/releases/tag/2.6.0
typha:
version: v0.5.1
url: https://github.com/projectcalico/typha/releases/tag/v0.5.1
calicoctl:
version: v1.6.1
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.1
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.1/calicoctl
calico/node:
version: v2.6.0
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0
calico/cni:
version: v1.11.0
url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.0
download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.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-controllers:
version: v1.0.0
url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.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.6.0-rc3
note: |
27 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc2
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc2
typha:
version: v0.5.1
url: https://github.com/projectcalico/typha/releases/tag/v0.5.1
calicoctl:
version: v1.6.0-rc2
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc2
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc2/calicoctl
calico/node:
version: v2.6.0-rc2
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc2
calico/cni:
version: v1.11.0
url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.0
download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.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-controllers:
version: v1.0.0
url: https://github.com/projectcalico/kube-controllers/releases/tag/v1.0.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.6.0-rc2
note: |
24 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc2
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc2
typha:
version: v0.5.1
url: https://github.com/projectcalico/typha/releases/tag/v0.5.1
calicoctl:
version: v1.6.0-rc2
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc2
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc2/calicoctl
calico/node:
version: v2.6.0-rc2
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc2
calico/cni:
version: v1.11.0
url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.0
download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.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: v1.0.0-rc2
url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.0-rc2
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.6.0-rc1
note: |
22 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc1
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc1
typha:
version: v0.5.0
url: https://github.com/projectcalico/typha/releases/tag/v0.5.0
calicoctl:
version: v1.6.0-rc1
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc1
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc1/calicoctl
calico/node:
version: v2.6.0-rc1
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc1
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: v1.0.0-rc1
url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.0-rc1
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: ""

v2.5:
- title: v2.5.1
note: |
Expand Down Expand Up @@ -1104,149 +1289,6 @@ master:
calico/routereflector:
version: v0.4.0
url: ""

v2.6:
- title: v2.6.0-rc3
note: |
27 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc2
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc2
typha:
version: v0.5.1
url: https://github.com/projectcalico/typha/releases/tag/v0.5.1
calicoctl:
version: v1.6.0-rc2
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc2
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc2/calicoctl
calico/node:
version: v2.6.0-rc2
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc2
calico/cni:
version: v1.11.0
url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.0
download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.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-controllers:
version: v1.0.0
url: https://github.com/projectcalico/kube-controllers/releases/tag/v1.0.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.6.0-rc2
note: |
24 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc2
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc2
typha:
version: v0.5.1
url: https://github.com/projectcalico/typha/releases/tag/v0.5.1
calicoctl:
version: v1.6.0-rc2
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc2
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc2/calicoctl
calico/node:
version: v2.6.0-rc2
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc2
calico/cni:
version: v1.11.0
url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.0
download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.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: v1.0.0-rc2
url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.0-rc2
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.6.0-rc1
note: |
22 September 2017
Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
<div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
components:
felix:
version: 2.6.0-rc1
url: https://github.com/projectcalico/felix/releases/tag/2.6.0-rc1
typha:
version: v0.5.0
url: https://github.com/projectcalico/typha/releases/tag/v0.5.0
calicoctl:
version: v1.6.0-rc1
url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.0-rc1
download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.0-rc1/calicoctl
calico/node:
version: v2.6.0-rc1
url: https://github.com/projectcalico/calico/releases/tag/v2.6.0-rc1
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: v1.0.0-rc1
url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.0-rc1
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: ""

# vX.Y format: update during major release process
currentReleaseStream: v2.6

Expand Down
6 changes: 4 additions & 2 deletions _layouts/docwithnav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Version ({% if page.version == 'master' %}nightly{% else %}{{page.version}}{% endif %})<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{site.baseurl}}/v2.5/introduction">v2.5 (latest)</a></li>
<li><a href="{{site.baseurl}}/v2.6/introduction">v2.6 (latest)</a></li>
<li><a href="{{site.baseurl}}/v2.5/introduction">v2.5</a></li>
<li><a href="{{site.baseurl}}/v2.4/introduction">v2.4</a></li>
<li><a href="{{site.baseurl}}/v2.3/introduction">v2.3</a></li>
<li><a href="{{site.baseurl}}/v2.2/introduction">v2.2</a></li>
Expand All @@ -152,7 +153,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Version ({% if page.version == 'master' %}nightly{% else %}{{page.version}}{% endif %})<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{site.baseurl}}/v2.5/introduction">v2.5 (latest)</a></li>
<li><a href="{{site.baseurl}}/v2.6/introduction">v2.5 (latest)</a></li>
<li><a href="{{site.baseurl}}/v2.5/introduction">v2.5</a></li>
<li><a href="{{site.baseurl}}/v2.4/introduction">v2.4</a></li>
<li><a href="{{site.baseurl}}/v2.3/introduction">v2.3</a></li>
<li><a href="{{site.baseurl}}/v2.2/introduction">v2.2</a></li>
Expand Down
10 changes: 5 additions & 5 deletions calico_node/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FELIX_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREA
CALICOCTL_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calicoctl.version')
LIBNETWORK_PLUGIN_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.libnetwork-plugin.version')
TYPHA_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.typha.version')
K8S_POLICY_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/kube-controllers.version')
KUBE_CONTROLLERS_VER ?= $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/kube-controllers.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-calico-0.4.0
Expand All @@ -42,7 +42,7 @@ print-version:
$(info $$CALICO_VER is ${CALICO_VER})
$(info $$CONFD_VER is ${CONFD_VER})
$(info $$FELIX_VER is ${FELIX_VER})
$(info $$K8S_POLICY_VER is ${K8S_POLICY_VER})
$(info $$KUBE_CONTROLLERS_VER is ${KUBE_CONTROLLERS_VER})
$(info $$TYPHA_VER is ${TYPHA_VER})

###############################################################################
Expand Down Expand Up @@ -566,7 +566,7 @@ $(RELEASE_DIR)/README:
@echo "* The calico/node docker image (version $(CALICO_VER))" >> $@
@echo "* The calico/typha docker image (version $(TYPHA_VER))" >> $@
@echo "* The calico/cni docker image (version $(CNI_VER))" >> $@
@echo "* The calico/kube-controllers docker image (version $(K8S_POLICY_VER))" >> $@
@echo "* The calico/kube-controllers docker image (version $(KUBE_CONTROLLERS_VER))" >> $@
@echo "" >> $@
@echo "Binaries (for amd64) (under 'bin')" >> $@
@echo "* The calicoctl binary (for Linux) (version $(CALICOCTL_VER))" >> $@
Expand Down Expand Up @@ -609,8 +609,8 @@ $(RELEASE_DIR_IMAGES)/calico-cni.tar:

$(RELEASE_DIR_IMAGES)/calico-kube-controllers.tar:
mkdir -p $(RELEASE_DIR_IMAGES)
docker pull calico/kube-controllers:$(K8S_POLICY_VER)
docker save --output $@ calico/kube-controllers:$(K8S_POLICY_VER)
docker pull calico/kube-controllers:$(KUBE_CONTROLLERS_VER)
docker save --output $@ calico/kube-controllers:$(KUBE_CONTROLLERS_VER)

$(RELEASE_DIR_BIN)/%:
mkdir -p $(RELEASE_DIR_BIN)
Expand Down
Loading

0 comments on commit 166d0de

Please sign in to comment.