Merge pull request #981 from caseydavenport/release-2.4.0

Release 2.4.0

_data/versions.yml

@@ -1,3 +1,134 @@
+v2.4:
+
+- title: v2.4.0
+  note: |
+    31 July 2017
+
+    Detailed release notes can be found on [GitHub](https://github.com/projectcalico/calico/releases).
+
+  components:
+    felix:
+      version: 2.4.0
+      url: https://github.com/projectcalico/felix/releases/tag/2.4.0
+    typha:
+      version: v0.3.1
+      url: https://github.com/projectcalico/typha/releases/tag/v0.3.1
+    calicoctl:
+      version: v1.4.0
+      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.4.0
+      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.4.0/calicoctl
+    calico/node:
+      version: v2.4.0
+    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.4.0-rc2
+  note: |
+    27 July 2017
+
+    Work-in-progress release notes for the upcoming v2.4.0 release can be found on GitHub.
+
+  components:
+    felix:
+      version: 2.4.0-rc2
+      url: https://github.com/projectcalico/felix/releases/tag/2.4.0-rc2
+    typha:
+      version: v0.3.1
+      url: https://github.com/projectcalico/typha/releases/tag/v0.3.1
+    calicoctl:
+      version: v1.4.0-rc2
+      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.4.0-rc2
+      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.4.0-rc2/calicoctl
+    calico/node:
+      version: v2.4.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.4.0-rc1
+  note: |
+    24 July 2017
+
+    Work-in-progress release notes for the upcoming v2.4.0 release can be found on GitHub.
+
+  components:
+    felix:
+      version: 2.4.0-rc1
+      url: https://github.com/projectcalico/felix/releases/tag/2.4.0-rc1
+    typha:
+      version: v0.3.0
+      url: https://github.com/projectcalico/typha/releases/tag/v0.3.0
+    calicoctl:
+      version: v1.4.0-rc1
+      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.4.0-rc1
+      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.4.0-rc1/calicoctl
+    calico/node:
+      version: v2.4.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: 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: ""
+
 v2.3:
 - title: v2.3.0
   note: |
@@ -709,100 +840,6 @@ v2.1:
       url: http://git.openstack.org/cgit/openstack/networking-calico/commit/?h=1.4.1
 
 
-v2.4:
-
-- title: v2.4.0-rc2
-  note: |
-    27 July 2017
-
-    ### Changes / New Features
-
-    Work-in-progress release notes for the upcoming v2.4.0 release can be found on GitHub.
-
-  components:
-    felix:
-      version: 2.4.0-rc2
-      url: https://github.com/projectcalico/felix/releases/tag/2.4.0-rc2
-    typha:
-      version: v0.3.1
-      url: https://github.com/projectcalico/typha/releases/tag/v0.3.1
-    calicoctl:
-      version: v1.4.0-rc2
-      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.4.0-rc2
-      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.4.0-rc2/calicoctl
-    calico/node:
-      version: v2.4.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.4.0-rc1
-  note: |
-    24 July 2017
-
-    ### Changes / New Features
-
-    Work-in-progress release notes for the upcoming v2.4.0 release can be found on GitHub.
-
-  components:
-    felix:
-      version: 2.4.0-rc1
-      url: https://github.com/projectcalico/felix/releases/tag/2.4.0-rc1
-    typha:
-      version: v0.3.0
-      url: https://github.com/projectcalico/typha/releases/tag/v0.3.0
-    calicoctl:
-      version: v1.4.0-rc1
-      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.4.0-rc1
-      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.4.0-rc1/calicoctl
-    calico/node:
-      version: v2.4.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: 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: ""
-
-
 # The master release stream is used to generate the master version of the docs,
 # as well as for builds of `calico/node:master` via CI.  Submit PRs to update the
 # versions when a component changes.
@@ -811,7 +848,7 @@ master:
   note: ""
   components:
      felix:
-      version: 2.4.0-rc2 
+      version: 2.4.0
       url: ""
      calicoctl:
       version: master
@@ -823,8 +860,8 @@ master:
      calico/cni:
       version: master 
       url: ""
-      download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.9.1/calico
-      download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.9.1/calico-ipam
+      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

_layouts/docwithnav.html

@@ -103,7 +103,8 @@
              <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Version ({{page.version}})<span class="caret"></span></a>
                <ul class="dropdown-menu">
-                 <li><a href="{{site.baseurl}}/v2.3/introduction">v2.3 (latest)</a></li>
+                 <li><a href="{{site.baseurl}}/v2.4/introduction">v2.4 (latest)</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>
                  <li><a href="{{site.baseurl}}/v2.1/introduction">v2.1</a></li>
                  <li><a href="{{site.baseurl}}/v2.0/introduction">v2.0</a></li>
@@ -127,7 +128,8 @@
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Version ({{page.version}})<span class="caret"></span></a>
                 <ul class="dropdown-menu">
-                   <li><a href="{{site.baseurl}}/v2.3/introduction">v2.3 (latest)</a></li>
+                   <li><a href="{{site.baseurl}}/v2.4/introduction">v2.4 (latest)</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>
                    <li><a href="{{site.baseurl}}/v2.1/introduction">v2.1</a></li>
                    <li><a href="{{site.baseurl}}/v2.0/introduction">v2.0</a></li>

index.html

@@ -5,5 +5,5 @@
 ---
 <p>You are being redirected to the latest release of Calico Docs.</p>
 <script type="text/javascript">
-window.location = "v2.3/introduction"
+window.location = "v2.4/introduction"
 </script>

v2.3/getting-started/bare-metal/bare-metal-install.md

@@ -1,6 +1,5 @@
 ---
 title: Installing Felix as a static binary
-redirect_from: latest/getting-started/bare-metal/bare-metal-install
 ---
 
 These instructions will take you through a first-time install of

v2.3/getting-started/bare-metal/bare-metal.md

@@ -1,6 +1,5 @@
 ---
 title: Using Calico to Secure Host Interfaces
-redirect_from: latest/getting-started/bare-metal/bare-metal
 ---
 
 This guide describes how to use Calico to secure the network interfaces

v2.3/getting-started/docker/index.md

@@ -1,6 +1,5 @@
 ---
 title: Calico with Docker
-redirect_from: latest/getting-started/docker/index
 ---
 
 Calico implements a Docker network plugin that can be used to provide routing and advanced network policy for Docker containers.

v2.3/getting-started/docker/installation/manual.md

@@ -1,6 +1,5 @@
 ---
 title: Installing Calico for Docker
-redirect_from: latest/getting-started/docker/installation/manual
 ---
 
 Calico runs as a Docker container on each host. The `calicoctl` command line tool can be used to launch the `calico/node` container.

v2.3/getting-started/docker/installation/requirements.md

@@ -1,6 +1,5 @@
 ---
 title:  Requirements
-redirect_from: latest/getting-started/docker/installation/requirements
 ---
 
 The following information details basic prerequisites that must be met

v2.3/getting-started/docker/installation/vagrant-coreos/index.md

@@ -1,6 +1,5 @@
 ---
 title: Running the Calico tutorials on CoreOS Container Linux using Vagrant and VirtualBox
-redirect_from: latest/getting-started/docker/installation/vagrant-coreos/index
 ---
 
 These instructions allow you to set up a CoreOS Container Linux cluster ready to network Docker containers with

v2.3/getting-started/docker/installation/vagrant-ubuntu/index.md

@@ -1,6 +1,5 @@
 ---
 title: Running the Calico tutorials on Ubuntu using Vagrant and VirtualBox
-redirect_from: latest/getting-started/docker/installation/vagrant-ubuntu/index
 ---
 
 These instructions allow you to set up an Ubuntu cluster ready to network Docker containers with

v2.3/getting-started/docker/troubleshooting.md

@@ -1,5 +1,4 @@
 ---
 title: Troubleshooting Calico for Docker
-redirect_from: latest/getting-started/docker/troubleshooting
 ---
 Information coming soon!

v2.3/getting-started/docker/tutorials/ipam.md

@@ -1,6 +1,5 @@
 ---
 title: IPAM
-redirect_from: latest/getting-started/docker/tutorials/ipam
 ---
 
 With the release of Docker 1.10, support has been added to allow users to

v2.3/getting-started/docker/tutorials/security-using-calico-profiles-and-policy.md

@@ -1,6 +1,5 @@
 ---
 title: Security using Calico Profiles and Policy
-redirect_from: latest/getting-started/docker/tutorials/security-using-calico-profiles-and-policy
 ---
 
 ## Background

v2.3/getting-started/docker/tutorials/security-using-calico-profiles.md

@@ -1,6 +1,5 @@
 ---
 title: Security using Calico Profiles
-redirect_from: latest/getting-started/docker/tutorials/security-using-calico-profiles
 ---
 
 ## Background

v2.3/getting-started/docker/tutorials/security-using-docker-labels-and-calico-policy.md

@@ -1,6 +1,5 @@
 ---
 title: Security using Docker Labels and Calico Policy
-redirect_from: latest/getting-started/docker/tutorials/security-using-docker-labels-and-calico-policy
 ---
 
 ## Background

v2.3/getting-started/docker/upgrade.md

@@ -1,5 +1,4 @@
 ---
 title: Upgrading Calico for Docker
-redirect_from: latest/getting-started/docker/upgrade
 ---
 Information coming soon!

v2.3/getting-started/index.md

@@ -1,6 +1,5 @@
 ---
 title: Calico Integrations
-redirect_from: latest/getting-started/index
 ---
 
 To get started using Calico, we recommend running through one or more of the

v2.3/getting-started/kubernetes/index.md

@@ -1,6 +1,5 @@
 ---
 title: Calico for Kubernetes
-redirect_from: latest/getting-started/kubernetes/index
 ---
 
 Calico enables networking and network policy in Kubernetes clusters across the cloud.  Calico works

v2.3/getting-started/kubernetes/installation/aws.md

@@ -1,6 +1,5 @@
 ---
 title: Deploying Calico and Kubernetes on AWS
-redirect_from: latest/getting-started/kubernetes/installation/aws
 ---
 
 There are a number of solutions for deploying Calico and Kubernetes on AWS.  We recommend taking

v2.3/getting-started/kubernetes/installation/gce.md

@@ -1,6 +1,5 @@
 ---
 title: Deploying Calico and Kubernetes on GCE
-redirect_from: latest/getting-started/kubernetes/installation/gce
 ---
 
 See [this page]({{site.baseurl}}/{{page.version}}/reference/public-cloud/gce)