Merge pull request #26 from codefresh-io/add-version-overrides

Add version overrides

Author: oren-codefresh

Dockerfile

@@ -2,8 +2,12 @@ FROM alpine:3.6 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.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.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.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.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
 
@@ -13,12 +17,16 @@ FROM alpine:3.6
 RUN apk add --update bash
 
 #copy all versions of kubectl to switch between them later.
+COPY --from=builder kubectl1.16 /usr/local/bin/
 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/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.11 /usr/local/bin/kubectl1.12 /usr/local/bin/kubectl1.13 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15 /usr/local/bin/kubectl1.16
 
 WORKDIR /
 

README.md

@@ -24,6 +24,10 @@ 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 kubectl version.  Supports 10-16.
+
 # Usage in codefresh.io
 
 ### deployment.yml

cf-deploy-kubernetes.sh

@@ -48,7 +48,7 @@ if [[ -n "$KUBERNETES_SERVER" && -n "$KUBERNETES_USER" && -n "$KUBERNETES_PASSWO
 else
     if [[ -z "${KUBECONTEXT}" ]]; then
         KUBECONTEXT=$(kubectl config current-context)
-         If KUBECONFIG is set we obligate to set KUBECONTEXT to valid context name
+        # If KUBECONFIG is set we obligate to set KUBECONTEXT to valid context name
         if [[ -n "${KUBECONFIG}" ]]; then
           echo -e "--- ERROR - KUBECONTEXT Environment variable is not set, please set it to one of integrated contexts: "
           kubectl config get-contexts
@@ -59,13 +59,40 @@ 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
-[ ! -f "${deployment_file}" ] && echo "Couldn't find $deployment_file file at $(pwd)" && exit 1;
+# Add SERVER_VERSION override and testing capabilities
+
+if [[ -n "${SERVER_VERSION}" ]]; then
+    # Statically define SERVER_VERSION from variable override
+    echo "Statically defined version: ${SERVER_VERSION}"
+    # Assign kubectl version 
+    echo "Setting kubectl to version 1.${SERVER_VERSION}"
+    cp -f "/usr/local/bin/kubectl1.${SERVER_VERSION}" /usr/local/bin/kubectl 2>/dev/null
+else
+    #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;
+fi
+
+# Simple testing logic for making sure override 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    
 
 DEPLOYMENT_FILE=${deployment_file}-$(date '+%y-%m-%d_%H-%M-%S').yml
 $(dirname $0)/template.sh "$deployment_file" > "$DEPLOYMENT_FILE" || fatal "Failed to apply deployment template on $deployment_file"