github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58386 from deads2k/controller-06-id

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 58375, 58306, 58386, 57420, 58035). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

handle uniquified holder identities

script update for https://github.com/kubernetes/kubernetes/pull/58302

This has to be done first to allow CI to pass.  We need unique leasing identities and hostnames, particularly locally determined ones, aren't unique.  

/assign liggitt
/assign mikedanese
This commit is contained in:
Kubernetes Submit Queue 2018-01-17 13:08:33 -08:00 committed by GitHub
commit 32f0073dcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/addon-manager/Makefile
View File

@ -15,7 +15,7 @@
IMAGE=gcr.io/google-containers/kube-addon-manager IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.4 VERSION=v8.5
KUBECTL_VERSION?=v1.8.4 KUBECTL_VERSION?=v1.8.4
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)

2
cluster/addons/addon-manager/kube-addons.sh
View File

@ -155,7 +155,7 @@ function is_leader() {
fi fi
KUBE_CONTROLLER_MANAGER_LEADER=`${KUBECTL} -n kube-system get ep kube-controller-manager \ 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"}}' \ -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 # 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 # 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. # managers at all, we're going to assume that we're the leader in such case.