github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36214 from jszczepkowski/fix-master-kubelet

Browse Source 
Automatic merge from submit-queue

Fixed not registering master during cluster creation.
This commit is contained in:
Kubernetes Submit Queue
2016-11-04 03:45:43 -07:00
committed by GitHub
parent 0a86b5ec34 5e8c569356
commit 403697be4a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/util.sh
View File

@@ -776,7 +776,11 @@ function create-master() {
create-static-ip "${MASTER_NAME}-ip" "${REGION}" create-static-ip "${MASTER_NAME}-ip" "${REGION}"
MASTER_RESERVED_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \ MASTER_RESERVED_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)') --project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
KUBELET_APISERVER="${MASTER_RESERVED_IP}"
if [[ "${REGISTER_MASTER_KUBELET:-}" == "true" ]]; then
KUBELET_APISERVER="${MASTER_RESERVED_IP}"
fi
KUBERNETES_MASTER_NAME="${MASTER_RESERVED_IP}" KUBERNETES_MASTER_NAME="${MASTER_RESERVED_IP}"
create-certs "${MASTER_RESERVED_IP}" create-certs "${MASTER_RESERVED_IP}"