mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Use --format='value()' instead of --fields with gcloud
This commit is contained in:
parent
93e3df8e55
commit
6cd9dcba60
@ -313,8 +313,7 @@ function detect-nodes () {
|
|||||||
KUBE_NODE_IP_ADDRESSES=()
|
KUBE_NODE_IP_ADDRESSES=()
|
||||||
for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
|
for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
|
||||||
local node_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \
|
local node_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \
|
||||||
"${NODE_NAMES[$i]}" --fields networkInterfaces[0].accessConfigs[0].natIP \
|
"${NODE_NAMES[$i]}" --format='value(networkInterfaces[0].accessConfigs[0].natIP)')
|
||||||
--format=text | awk '{ print $2 }')
|
|
||||||
if [[ -z "${node_ip-}" ]] ; then
|
if [[ -z "${node_ip-}" ]] ; then
|
||||||
echo "Did not find ${NODE_NAMES[$i]}" >&2
|
echo "Did not find ${NODE_NAMES[$i]}" >&2
|
||||||
else
|
else
|
||||||
@ -341,8 +340,7 @@ function detect-master () {
|
|||||||
KUBE_MASTER=${MASTER_NAME}
|
KUBE_MASTER=${MASTER_NAME}
|
||||||
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
||||||
KUBE_MASTER_IP=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \
|
KUBE_MASTER_IP=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \
|
||||||
"${MASTER_NAME}" --fields networkInterfaces[0].accessConfigs[0].natIP \
|
"${MASTER_NAME}" --format='value(networkInterfaces[0].accessConfigs[0].natIP)')
|
||||||
--format=text | awk '{ print $2 }')
|
|
||||||
fi
|
fi
|
||||||
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
||||||
echo "Could not detect Kubernetes master node. Make sure you've launched a cluster with 'kube-up.sh'" >&2
|
echo "Could not detect Kubernetes master node. Make sure you've launched a cluster with 'kube-up.sh'" >&2
|
||||||
|
Loading…
Reference in New Issue
Block a user