From cf66c8d50743cddc9b20efda6e87c253c00c8493 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 11 Jun 2018 17:12:57 +0000 Subject: [PATCH] Don't remove myself when reclaiming Some logs from users show an entry of X with annotation X, which suggests we have gone down the path of removing ourselves. This change avoids that possibility. --- prog/kube-peers/main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prog/kube-peers/main.go b/prog/kube-peers/main.go index 1b17a88f..a4a22222 100644 --- a/prog/kube-peers/main.go +++ b/prog/kube-peers/main.go @@ -119,6 +119,10 @@ func reclaimRemovedPeers(weave *weaveapi.Client, cml *configMapAnnotations, node } // 2. Loop for each X in the first set and not in the second - we wish to remove X from our data structures for _, peer := range peerMap { + if peer.PeerName == myPeerName { // Don't remove myself. + common.Log.Warnln("[kube-peers] not removing myself", peer) + continue + } common.Log.Debugln("[kube-peers] Preparing to remove disappeared peer", peer) okToRemove := false // 3. Check if there is an existing annotation with key X