From 51c3ea184accd56e535dbba4a6f2c0ff1210833d Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 27 Nov 2017 15:04:39 +0000 Subject: [PATCH 1/2] Fix release script for plugin latest_release We should never update the latest_release plugin on a PRERELEASE. We should always update it on a MAINLINE or BRANCH release. --- bin/release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/release b/bin/release index b1b4e5bc..8849d725 100755 --- a/bin/release +++ b/bin/release @@ -196,7 +196,7 @@ publish() { if [ "$RELEASE_TYPE" = 'PRERELEASE' ] ; then echo "== Building and pushing plugin" - make UPDATE_LATEST=$IS_MAINLINE SUDO=$SUDO WEAVE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER plugin_publish + make UPDATE_LATEST=false SUDO=$SUDO WEAVE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER plugin_publish echo "** Plugin built and pushed" echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" @@ -232,7 +232,7 @@ publish() { echo '** Sanity checks OK for publishing tag' $LATEST_TAG as $DOCKERHUB_USER/weave:$VERSION echo "== Building and pushing plugin" - make UPDATE_LATEST=$IS_MAINLINE SUDO=$SUDO WEAVE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER plugin_publish + make UPDATE_LATEST=true SUDO=$SUDO WEAVE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER plugin_publish echo "** Plugin built and pushed" echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" From f670be431546e12a997bc3a71ac9ed238a6308ae Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 4 Dec 2017 14:38:05 +0000 Subject: [PATCH 2/2] Add release v2.1.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c674ba2d..5a8f380d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Release 2.1.3 + +This release fixes a race-condition in the IP reclaim code for weave-kube +where two nodes could end up fighting over the same space and break +connectivity #3190, #3192 + ## Release 2.1.2 This release fixes a couple of bugs discovered since the release of Weave Net 2.1.0