From 909e592e55cfb7ce9842a978cc9e7426c28dc0aa Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 17 Jan 2018 07:51:21 -0500 Subject: [PATCH 1/2] handle uniquified holder identities --- cluster/addons/addon-manager/kube-addons.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh index 314190f5f2b..68f17dbaadb 100755 --- a/cluster/addons/addon-manager/kube-addons.sh +++ b/cluster/addons/addon-manager/kube-addons.sh @@ -155,7 +155,7 @@ function is_leader() { fi KUBE_CONTROLLER_MANAGER_LEADER=`${KUBECTL} -n kube-system get ep kube-controller-manager \ -o go-template=$'{{index .metadata.annotations "control-plane.alpha.kubernetes.io/leader"}}' \ - | sed 's/^.*"holderIdentity":"\([^"]*\)".*/\1/'` + | sed 's/^.*"holderIdentity":"\([^"]*\)".*/\1/' | awk -F'_' '{print $1}'` # If there was any problem with getting the leader election results, var will # be empty. Since it's better to have multiple addon managers than no addon # managers at all, we're going to assume that we're the leader in such case. From 59c2cd7089b7cbc2d8429361d9a4460009d779a9 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 17 Jan 2018 12:53:27 -0500 Subject: [PATCH 2/2] bump addon version in makefile --- cluster/addons/addon-manager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 854cd4e2557..2bb48227272 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -15,7 +15,7 @@ IMAGE=gcr.io/google-containers/kube-addon-manager ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -VERSION=v8.4 +VERSION=v8.5 KUBECTL_VERSION?=v1.8.4 ifeq ($(ARCH),amd64)