Skip to content

K
k3s
Commit 59b1ff82 authored by Satyadeep Musuvathy's avatar Satyadeep Musuvathy
Browse files
Options

fixes #54017, remove deprecated --mode flag

parent 228c9915
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
cluster/gce/util.sh
View file @ 59b1ff82
...@@ -1542,14 +1542,8 @@ function check-existing() { ...@@ -1542,14 +1542,8 @@ function check-existing() {
fi fi
} }
# TODO(#54017): Remove below logics for handling deprecated network mode field.
# `x_gcloud_mode` was replaced by `x_gcloud_subnet_mode` in gcloud 175.0.0 and
# the content changed as well. Keeping such logic to make the transition eaiser.
function check-network-mode() { function check-network-mode() {
local mode="$(gcloud compute networks list --filter="name=('${NETWORK}')" --project ${NETWORK_PROJECT} --format='value(x_gcloud_subnet_mode)' || true)" local mode="$(gcloud compute networks list --filter="name=('${NETWORK}')" --project ${NETWORK_PROJECT} --format='value(x_gcloud_subnet_mode)' || true)"
if [[ -z "${mode}" ]]; then
mode="$(gcloud compute networks list --filter="name=('${NETWORK}')" --project ${NETWORK_PROJECT} --format='value(x_gcloud_mode)' || true)"
fi
# The deprecated field uses lower case. Convert to upper case for consistency. # The deprecated field uses lower case. Convert to upper case for consistency.
echo "$(echo $mode | tr [a-z] [A-Z])" echo "$(echo $mode | tr [a-z] [A-Z])"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment