Update version strings for release candidate v0.16.1

projectcalico · Feb 9, 2016 · 9e4ee75 · 9e4ee75
1 parent 99a8d79
commit 9e4ee75
Show file tree

Hide file tree

Showing 70 changed files with 106 additions and 464 deletions.
diff --git a/Makefile b/Makefile
@@ -31,15 +31,15 @@ dist/calicoctl: $(CALICOCTL_FILE) birdcl
 	# from the use of the --rm flag
 
 	-docker run -v `pwd`:/code --rm \
-	 calico/build:latest \
+	 calico/build:v0.11.0 \
 	 pyinstaller calicoctl.spec -ayF
 
 calico_test/.calico_test.created: $(TEST_CONTAINER_FILES)
 	cd calico_test && docker build -t calico/test:latest .
 	touch calico_test/.calico_test.created
 
 calico_node/.calico_node.created: $(NODE_CONTAINER_FILES)
-	cd calico_node && docker build -t calico/node:latest .
+	cd calico_node && docker build -t calico/node:v0.16.1 .
 	touch calico_node/.calico_node.created
 
 ## Generate the keys and certificates for running etcd with SSL.
@@ -65,7 +65,7 @@ certs/.certificates.created:
 	touch certs/.certificates.created
 
 calico-node.tar: calico_node/.calico_node.created
-	docker save --output calico-node.tar calico/node:latest
+	docker save --output calico-node.tar calico/node:v0.16.1
 
 busybox.tar:
 	docker pull busybox:latest

diff --git a/README.md b/README.md
@@ -1,13 +1,3 @@
-<!--- master only -->
-[![Build Status](https://semaphoreci.com/api/v1/projects/9d7d365d-19cb-4699-8c84-b76da25ae271/473490/shields_badge.svg)](https://semaphoreci.com/calico/calico-docker--5)
-[![CircleCI branch](https://img.shields.io/circleci/project/projectcalico/calico-containers/master.svg?label=calicoctl)](https://circleci.com/gh/projectcalico/calico-containers/tree/master)
-[![Coverage Status](https://coveralls.io/repos/projectcalico/calico-docker/badge.svg?branch=master&service=github)](https://coveralls.io/github/projectcalico/calico-docker?branch=master)
-[![Docker Pulls](https://img.shields.io/docker/pulls/calico/node.svg)](https://hub.docker.com/r/calico/node/)
-[![](https://badge.imagelayers.io/calico/node:latest.svg)](https://imagelayers.io/?images=calico/node:latest)
-
-[![Slack Status](https://calicousers-slackin.herokuapp.com/badge.svg)](https://calicousers-slackin.herokuapp.com)
-[![IRC Channel](https://img.shields.io/badge/irc-%23calico-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#calico)
-<!--- end of master only -->
 
 # Calico for containers
 Calico provides a highly scalable networking solution for connecting data 

diff --git a/calico_node/build.sh b/calico_node/build.sh
@@ -21,7 +21,7 @@ curl -L https://github.com/projectcalico/calico-bird/releases/download/v0.1.0/bi
 chmod +x /sbin/*
 
 # Install Felix
-pip install git+https://github.com/projectcalico/calico.git
+pip install git+https://github.com/projectcalico/calico.git@1.3.0a6
 
 # Output the python library list
 pip list > libraries.txt

diff --git a/calicoctl/calico_ctl/__init__.py b/calicoctl/calico_ctl/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.16.0-dev"
-__libnetwork_plugin_version__ = "v0.7.0-dev"
-__libcalico_version__ = "v0.11.0-dev"
-__felix_version__ = "1.3.0a6-dev"
+__version__ = "0.16.1"
+__libnetwork_plugin_version__ = "v0.7.0"
+__libcalico_version__ = "v0.11.0"
+__felix_version__ = "1.3.0a6"
diff --git a/calicoctl/calico_ctl/node.py b/calicoctl/calico_ctl/node.py
@@ -61,7 +61,7 @@
   --remove-endpoints        Remove the endpoint data when deleting the node
                             from the Calico network.
   --node-image=<DOCKER_IMAGE_NAME>    Docker image to use for Calico's per-node
-                            container. [default: calico/node:latest]
+                            container. [default: calico/node:v0.16.1]
   --detach=<DETACH>         Set "true" to run Calico service as detached,
                             "false" to run in the foreground.  When using
                             libnetwork, this may not be set to "false".
@@ -81,7 +81,7 @@
   --libnetwork              Use the libnetwork plugin.
   --libnetwork-image=<LIBNETWORK_IMAGE_NAME>    Docker image to use for
                             Calico's libnetwork driver.
-                            [default: calico/node-libnetwork:latest]
+                            [default: calico/node-libnetwork:v0.7.0]
 """
 
 DEFAULT_IPV4_POOL = IPPool("192.168.0.0/16")
@@ -442,7 +442,7 @@ def _start_node_container_rkt(ip, ip6, node_image, etcd_envs,
     files to mount on the container
     :return: None.
     """
-    if node_image == "calico/node:latest":
+    if node_image == "calico/node:v0.16.1":
         # The default image is being used so we need to append docker://
         node_image = "docker://%s" % node_image
 

diff --git a/docs/AdvancedNetworkPolicy.md b/docs/AdvancedNetworkPolicy.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Advanced Network Policy
 

diff --git a/docs/Components.md b/docs/Components.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Anatomy of a calico-node container
 

diff --git a/docs/DockerContainerLifecycle.md b/docs/DockerContainerLifecycle.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Lifecycle of a container (Calico without Docker networking)
 

diff --git a/docs/DockerlessCalicoManual.md b/docs/DockerlessCalicoManual.md
@@ -55,7 +55,7 @@ Please raise any encountered issues, or message us on [calico-slack](https://cal
 7. Install the additional binaries for Dockerless-calico:
     ```
     # calicoctl
-    curl -L http://www.projectcalico.org/builds/calicoctl -o /usr/local/bin/calicoctl
+    curl -L http://www.projectcalico.org/builds/calicoctl?circleci-branch=v0.16.1-candidate -o /usr/local/bin/calicoctl
     chmod +x /usr/local/bin/calicoctl
     
     # bird

diff --git a/docs/EtcdSecureCluster.md b/docs/EtcdSecureCluster.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](./images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Using Calico with a secure etcd cluster
 

diff --git a/docs/ExternalConnectivity.md b/docs/ExternalConnectivity.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # External Connectivity - Hosts on their own Layer 2 segment
 

diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Frequently Asked Questions
 This page contains answers to some frequently-asked questions about Calico on Docker.

diff --git a/docs/RepoStructure.md b/docs/RepoStructure.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Calico Repositories
 

diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Troubleshooting
 

diff --git a/docs/bgp.md b/docs/bgp.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # BGP Configuration
 

diff --git a/docs/calico-with-docker/AWS.md b/docs/calico-with-docker/AWS.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running the Calico tutorials on AWS
 Calico is designed to provide high performance massively scalable virtual

diff --git a/docs/calico-with-docker/DigitalOcean.md b/docs/calico-with-docker/DigitalOcean.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running the Calico tutorials on DigitalOcean
 Calico is designed to provide high performance massively scalable virtual networking for private data centers. But you 

diff --git a/docs/calico-with-docker/GCE.md b/docs/calico-with-docker/GCE.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running the Calico tutorials on GCE
 Calico is designed to provide high performance massively scalable virtual networking for private data centers. But you 

diff --git a/docs/calico-with-docker/VagrantCoreOS.md b/docs/calico-with-docker/VagrantCoreOS.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running the Calico tutorials on CoreOS using Vagrant and VirtualBox
 
@@ -19,16 +13,10 @@ These instructions allow you to set up a CoreOS cluster ready to network Docker
 * [Vagrant][vagrant] 1.7.4 or greater.
 * [Git][git]
 
-<!--- master only -->
-### 1.2 Clone this project
+### 1.2 Clone this project, and checkout the v0.16.1 release
 
     git clone https://github.com/projectcalico/calico-containers.git
-<!--- else
-### 1.2 Clone this project, and checkout the **release** release
-
-    git clone https://github.com/projectcalico/calico-containers.git
-    git checkout tags/**release**
-<!--- end of master only -->
+    git checkout tags/v0.16.1
 
 ### 1.4 Startup and SSH
 

diff --git a/docs/calico-with-docker/VagrantUbuntu.md b/docs/calico-with-docker/VagrantUbuntu.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running the Calico tutorials on Ubuntu using Vagrant and VirtualBox
 
@@ -19,16 +13,10 @@ These instructions allow you to set up an Ubuntu cluster ready to network Docker
 * [Vagrant][vagrant] 1.7.4 or greater.
 * [Git][git]
 
-<!--- master only -->
-### 1.2 Clone this project
+### 1.2 Clone this project, and checkout the v0.16.1 release
 
     git clone https://github.com/projectcalico/calico-containers.git
-<!--- else
-### 1.2 Clone this project, and checkout the **release** release
-
-    git clone https://github.com/projectcalico/calico-containers.git
-    git checkout tags/**release**
-<!--- end of master only -->
+    git checkout tags/v0.16.1
 
 ### 1.3 Startup and SSH
 

diff --git a/docs/calico-with-docker/docker-network-plugin/AdvancedPolicy.md b/docs/calico-with-docker/docker-network-plugin/AdvancedPolicy.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Accessing Calico policy with Calico as a network plugin
 

diff --git a/docs/calico-with-docker/docker-network-plugin/CalicoSwarm.md b/docs/calico-with-docker/docker-network-plugin/CalicoSwarm.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Running Calico on a Docker Swarm
 

diff --git a/docs/calico-with-docker/docker-network-plugin/IPv6.md b/docs/calico-with-docker/docker-network-plugin/IPv6.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Calico IPv6 networking as a Docker network plugin (Optional)
 

diff --git a/docs/calico-with-docker/docker-network-plugin/ManualSetup.md b/docs/calico-with-docker/docker-network-plugin/ManualSetup.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Preparing the environment for Calico as a Docker network plugin
 
@@ -67,7 +61,7 @@ If you prefer not to do this you can still run the demo but remember to run
 
 Get the calicoctl binary onto each host.
 
-	wget http://www.projectcalico.org/builds/calicoctl
+	wget http://www.projectcalico.org/builds/calicoctl?circleci-branch=v0.16.1-candidate
 	chmod +x calicoctl
 
 This binary should be placed in your `$PATH` so it can be run from any
@@ -80,8 +74,8 @@ run `calicoctl node` the first time.  Select the appropriate versions of the
 `calico/node` and `calico/node-libnetwork` as required by the version of 
 calicoctl:
 
-    docker pull calico/node:latest
-    docker pull calico/node-libnetwork:latest
+    docker pull calico/node:v0.16.1
+    docker pull calico/node-libnetwork:v0.7.0
 
 ### Final checks
 

diff --git a/docs/calico-with-docker/docker-network-plugin/README.md b/docs/calico-with-docker/docker-network-plugin/README.md
@@ -1,10 +1,4 @@
-<!--- master only -->
-> ![warning](../../images/warning.png) This document applies to the HEAD of the calico-containers source tree.
->
-> View the calico-containers documentation for the latest release [here](https://github.com/projectcalico/calico-containers/blob/v0.14.0/README.md).
-<!--- else
-> You are viewing the calico-containers documentation for release **release**.
-<!--- end of master only -->
+> You are viewing the calico-containers documentation for release v0.16.1.
 
 # Calico as a Docker network plugin.
 
@@ -71,8 +65,8 @@ You should see output like this on each node
 
     vagrant@calico-01:~$ docker ps
     CONTAINER ID        IMAGE                           COMMAND                  CREATED             STATUS              PORTS               NAMES
-    eec9ebbfb486        calico/node-libnetwork:latest   "./start.sh"             21 seconds ago      Up 19 seconds                           calico-libnetwork
-    ffe6cb403e9b        calico/node:latest              "/sbin/my_init"          21 seconds ago      Up 20 seconds                           calico-node
+    eec9ebbfb486        calico/node-libnetwork:v0.7.0   "./start.sh"             21 seconds ago      Up 19 seconds                           calico-libnetwork
+    ffe6cb403e9b        calico/node:v0.16.1              "/sbin/my_init"          21 seconds ago      Up 20 seconds                           calico-node
 
 ## 3. Create the networks
 

diff --git a/docs/calico-with-docker/docker-network-plugin/cloud-config/user-data-first b/docs/calico-with-docker/docker-network-plugin/cloud-config/user-data-first
@@ -83,5 +83,5 @@ write_files:
   owner: root
   content: |
     #!/usr/bin/bash -e
-    wget -O /opt/bin/calicoctl http://www.projectcalico.org/builds/calicoctl
+    wget -O /opt/bin/calicoctl http://www.projectcalico.org/builds/calicoctl?circleci-branch=v0.16.1-candidate
     chmod +x /opt/bin/calicoctl