updating logic and adding some simple test support

Author: dustinvanbuskirk

Dockerfile

@@ -1,24 +1,25 @@
-FROM alpine:3.6 AS builder
+FROM alpine:3.9 AS builder
 
 RUN apk update && apk add curl
 
-RUN curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl
 RUN curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl
+RUN curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl
+RUN curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl
 RUN curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl
 RUN curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/amd64/kubectl
 
-
-FROM alpine:3.6
+FROM alpine:3.9
 
 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/kubectl
+COPY --from=builder kubectl1.14 /usr/local/bin/kubectl
+COPY --from=builder kubectl1.12 /usr/local/bin/
+COPY --from=builder kubectl1.10 /usr/local/bin/
 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.12 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15
 
 WORKDIR /
 

README.md

@@ -24,6 +24,9 @@ The following env variables control the deployment configuration:
 3. KUBERNETES_NAMESPACE - The namespace to deploy
 4. KUBECTL_ACTION - means an action for `kubectl <action>`. Valid values are apply|create|replace. Default is "apply"
 
+Optional:
+`SERVER_VERSION` - Used mainly for testing. Manually set the Minor Kubernetes version.
+
 # Usage in codefresh.io
 
 ### deployment.yml

cf-deploy-kubernetes.sh

@@ -59,12 +59,49 @@ else
     fi
 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
+# Add SERVER_VERSION override and testing capabilities
+
+if [[ -z "${SERVER_VERSION}" ]]; then
+    # Dynamically define SERVER_VERSION using kube context
+    echo "Statically defined version: ${SERVER_VERSION}"
+else
+    # Dynamically define SERVER_VERSION using kube context
+    SERVER_VERSION=$(kubectl version --short=true --context "${KUBECONTEXT}" | grep -i server | cut -d ':' -f2 | cut -d '.' -f2 | sed 's/[^0-9]*//g')
+    echo "Dynamically defined version: ${SERVER_VERSION}"
+fi
+
+# Determine appropriate kubectl version
+if (( "$SERVER_VERSION" >= "15" )); then
+    KUBE_CTL="15"
+elif (( "${SERVER_VERSION}" >= "13" && "${SERVER_VERSION}" <= "14")); )); then
+    KUBE_CTL="14"
+elif (( "${SERVER_VERSION}" >= "12" && "${SERVER_VERSION}" <= "11")); )); then
+    KUBE_CTL="12"
+elif (( "${SERVER_VERSION}" >= "10" && "${SERVER_VERSION}" <= "9")); )); then
+    KUBE_CTL="10"
+elif (( "${SERVER_VERSION}" <= "6" )); then
+    KUBE_CTL="6"
+fi
+
+# Simple testing logic for making sure versions are set
+if [[ -z "${KUBE_CTL_TEST_VERSION}" ]]; then
+    if [ "${KUBE_CTL}" == "${KUBE_CTL_TEST_VERSION}" ]; then
+        echo "Version correctly set"
+        echo "Kubectl Version: ${KUBE_CTL}"
+        echo "Test Version: ${KUBE_CTL_TEST_VERSION}"
+        exit 0
+    else
+        echo "Version Mismatch"
+        echo "Kubectl Version: ${KUBE_CTL}"
+        echo "Test Version: ${KUBE_CTL_TEST_VERSION}"
+        exit 1
+fi    
+
+# Assign kubectl version unless default
+if (( "$KUBE_CTL" != "14" )); then
+    cp -f /usr/local/bin/kubectl1.${KUBE_CTL} /usr/local/bin/kubectl
+fi
+
 [ ! -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