Merge pull request #12 from codefresh-io/SAAS-532-bug-fix-kubectl-version-check

Fixing method to check kubectl version to use

Author: francisco-cocozza

cf-deploy-kubernetes.sh

@@ -38,9 +38,9 @@ else
 fi
 
 #check the cluster version and decide which version of kubectl to use:
-SERVER_VERSION=$(kubectl version --short=true --context "${KUBECONTEXT}" | grep -i server | cut -c18-20 | tr -d .)
-
-if (( "$SERVER_VERSION" <= "16" )); then mv /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl; fi 2>/dev/null
+SERVER_VERSION=$(kubectl version --short=true --context "${KUBECONTEXT}" | grep -i server | cut -d ':' -f2 | cut -d '.' -f2 | sed 's/[^0-9]*//g')
+echo "Server minor version: $SERVER_VERSION"
+if (( "$SERVER_VERSION" <= "6" )); then mv /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl; fi 2>/dev/null
 
 
 [ ! -f "${deployment_file}" ] && echo "Couldn't find $deployment_file file at $(pwd)" && exit 1;