Merge pull request #86815 from krzysied/kubemark_internal_ip_fix

Kubemark - adding private cluster check
This commit is contained in:
Kubernetes Prow Robot 2020-01-03 09:49:41 -08:00 committed by GitHub
commit ce2102f363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -88,8 +88,10 @@ function create-kubemark-master {
REGION=$(grep -o "^[a-z]*-[a-z0-9]*" "${KUBE_TEMP}"/cluster-location.txt)
MASTER_NAME="${KUBE_GCE_INSTANCE_PREFIX}"-master
MASTER_INTERNAL_IP=$(gcloud compute addresses describe "${MASTER_NAME}-internal-ip" \
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
if [[ ${GCE_PRIVATE_CLUSTER:-} == "true" ]]; then
MASTER_INTERNAL_IP=$(gcloud compute addresses describe "${MASTER_NAME}-internal-ip" \
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
fi
MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)')