Merge pull request #25 from codefresh-io/revert-back-to-dca00c6

Reverting back to dca00c6

Author: dustinvanbuskirk

Dockerfile

@@ -1,34 +1,24 @@
-FROM alpine:3.9 AS builder
+FROM alpine:3.6 AS builder
 
 RUN apk update && apk add curl
 
-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.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubectl
-RUN curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl
-RUN curl -o kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.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.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl
-RUN curl -o kubectl1.9 -L https://storage.googleapis.com/kubernetes-release/release/v1.9.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.9
+
+FROM alpine:3.6
 
 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.13 /usr/local/bin/
-COPY --from=builder kubectl1.12 /usr/local/bin/
-COPY --from=builder kubectl1.11 /usr/local/bin/
-COPY --from=builder kubectl1.10 /usr/local/bin/
-COPY --from=builder kubectl1.9 /usr/local/bin/
+COPY --from=builder kubectl1.10 /usr/local/bin/kubectl
 COPY --from=builder kubectl1.6 /usr/local/bin/
 
-# Set Default
-COPY --from=builder kubectl1.6 /usr/local/bin/kubectl
-
-RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl1.9 /usr/local/bin/kubectl1.10 /usr/local/bin/kubectl1.11 /usr/local/bin/kubectl1.12 /usr/local/bin/kubectl1.13 /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.14 /usr/local/bin/kubectl1.15
 
 WORKDIR /
 

README.md

@@ -24,10 +24,6 @@ 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` - Manually set the Minor Kubernetes version.  Supports 9-15.
-If left blank version 13 and older will use kubectl v1.6.0
-
 # Usage in codefresh.io
 
 ### deployment.yml

cf-deploy-kubernetes.sh

@@ -59,54 +59,12 @@ else
     fi
 fi
 
-# Add SERVER_VERSION override and testing capabilities
-
-if [[ -n "${SERVER_VERSION}" ]]; then
-    # Dynamically define SERVER_VERSION using kube context
-    echo "Statically defined version: ${SERVER_VERSION}"
-    KUBE_CTL=${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 not statically set
-if [[ -z "${KUBE_CTL}" ]]; then
-    if [[ "${SERVER_VERSION}" -eq "15" ]]; then
-        KUBE_CTL="15"
-    elif [[ "${SERVER_VERSION}" -eq "14" ]]; then
-        KUBE_CTL="14"
-    elif [[ "${SERVER_VERSION}" -le "13" && "${SERVER_VERSION}" -ge "6" ]]; then
-        KUBE_CTL="6"
-    else
-        echo "kubectl version: v1.${SERVER_VERSION}"
-        fatal "Version Not Supported!!!"
-        exit 1
-    fi
-fi
-
-# Assign kubectl version 
-echo "Setting kubectl to version 1.${KUBE_CTL}"
-cp -f "/usr/local/bin/kubectl1.${KUBE_CTL}" /usr/local/bin/kubectl
-
-# Simple testing logic for making sure versions are set
-if [[ -n "${KUBE_CTL_TEST_VERSION}" ]]; then
-    KUBE_CTL_VERSION=`kubectl version --client --short`
-    echo "Testing kubectl version is set..."
-    if [[ "${KUBE_CTL_VERSION}" == *"${KUBE_CTL_TEST_VERSION}"* ]]; then
-        echo "Version correctly set"
-        echo "Kubectl Version: ${KUBE_CTL_VERSION}"
-        echo "Test Version: ${KUBE_CTL_TEST_VERSION}"
-        exit 0
-    else
-        echo "Kubectl Version: ${KUBE_CTL_VERSION}"
-        echo "Test Version: ${KUBE_CTL_TEST_VERSION}"
-        fatal "Version Mismatch!!!"
-        exit 1
-    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
 [ ! -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