use 'kubectl version' with or without '--short' as appropriate (#4777)

Author: laverya

scripts/common/common.sh

@@ -1589,3 +1589,27 @@ function storage_migration_ready_timeout() {
     fi
     echo "$STORAGE_MIGRATION_READY_TIMEOUT"
 }
+
+# return the version of kubernetes that is currently installed on the server
+function kubectl_server_version() {
+    local kubectl_server_version=
+    if kubectl version --short > /dev/null 2>&1 ; then
+        kubectl_server_version="$(kubectl version --short | grep -i server | awk '{ print $3 }')"
+    else
+        # kubectl version --short is not supported in kubectl > 1.27, but is now the default behavior
+        kubectl_server_version="$(kubectl version | grep -i server | awk '{ print $3 }')"
+    fi
+    echo "$kubectl_server_version"
+}
+
+# return the version of kubernetes that is currently installed on the client
+function kubectl_client_version() {
+    local kubectl_client_version=
+    if kubectl version --short > /dev/null 2>&1 ; then
+        kubectl_client_version="$(kubectl version --short | grep -i client | awk '{ print $3 }')"
+    else
+        # kubectl version --short is not supported in kubectl > 1.27, but is now the default behavior
+        kubectl_client_version="$(kubectl version | grep -i client | awk '{ print $3 }')"
+    fi
+    echo "$kubectl_client_version"
+}

scripts/common/yaml.sh

@@ -73,7 +73,7 @@ function insert_bases() {
 
     local kubectl_client_minor_version=
     if commandExists "kubectl" ; then
-        kubectl_client_minor_version="$(kubectl version --short | grep -i client | awk '{ print $3 }' | cut -d '.' -f2)"
+        kubectl_client_minor_version="$(kubectl_client_version | cut -d '.' -f2)"
     else
         kubectl_client_minor_version="$(echo "$KUBERNETES_VERSION" | cut -d '.' -f2)"
     fi

scripts/tasks.sh

@@ -365,7 +365,8 @@ function join_token() {
     fi
 
     # get the kubernetes version
-    local kubernetes_version=$(kubectl get nodes --sort-by='{.status.nodeInfo.kubeletVersion}' -o=jsonpath='{.items[0].status.nodeInfo.kubeletVersion}' | sed 's/^v*//')
+    local kubernetes_version=
+    kubernetes_version=$(kubectl_server_version | sed 's/^v*//')
 
     local service_cidr=$(kubectl -n kube-system get cm kurl-config -ojsonpath='{ .data.service_cidr }')
     local pod_cidr=$(kubectl -n kube-system get cm kurl-config -ojsonpath='{ .data.pod_cidr }')