Merge pull request #17 from jfahrer/master

Add support for Kubernetes 1.13

Author: dustinvanbuskirk

Dockerfile

@@ -15,10 +15,11 @@ RUN apk add --update bash
 #copy all versions of kubectl to switch between them later.
 COPY --from=builder kubectl1.15 /usr/local/bin/
 COPY --from=builder kubectl1.14 /usr/local/bin/
+COPY --from=builder kubectl1.10 /usr/local/bin/
 COPY --from=builder kubectl1.10 /usr/local/bin/kubectl
 COPY --from=builder kubectl1.6 /usr/local/bin/
 
-RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15
+RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl1.10 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15
 
 WORKDIR /
 

cf-deploy-kubernetes.sh

@@ -62,9 +62,17 @@ 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 -d ':' -f2 | cut -d '.' -f2 | sed 's/[^0-9]*//g')
 echo "Server minor version: $SERVER_VERSION"
-if (( "$SERVER_VERSION" <= "6" )); then cp -f /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl; fi 2>/dev/null
-if (( "$SERVER_VERSION" == "14" )); then cp -f /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl; fi 2>/dev/null
-if (( "$SERVER_VERSION" >= "15" )); then cp -f /usr/local/bin/kubectl1.15 /usr/local/bin/kubectl; fi 2>/dev/null
+if (( "$SERVER_VERSION" <= "6" )); then
+  KUBECTL_MINOR_VERSION=6
+elif (( "$SERVER_VERSION" <= "12" )); then
+  KUBECTL_MINOR_VERSION=10
+elif (( "$SERVER_VERSION" <= "14" )); then
+  KUBECTL_MINOR_VERSION=14
+elif (( "$SERVER_VERSION" >= "15" )); then
+  KUBECTL_MINOR_VERSION=15
+fi
+cp -f /usr/local/bin/kubectl1.$KUBECTL_MINOR_VERSION /usr/local/bin/kubectl > 2>/dev/null
+
 [ ! -f "${deployment_file}" ] && echo "Couldn't find $deployment_file file at $(pwd)" && exit 1;
 
 DEPLOYMENT_FILE=${deployment_file}-$(date '+%y-%m-%d_%H-%M-%S').yml