Merge pull request #40 from codefresh-io/CR-7299

[CR-7299] bump kubectl version

Author: mikhail-klimko

Dockerfile

@@ -3,6 +3,12 @@ FROM alpine:3.6 AS builder
 RUN apk update && apk add curl
 
 RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") && \ 
+    curl -o kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ 
+    curl -o kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ 
+    curl -o kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ 
+    curl -o kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ 
+    curl -o kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ 
+    curl -o kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ 
     curl -o kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ 
     curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ 
     curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ 
@@ -18,6 +24,12 @@ FROM alpine:3.10
 RUN apk add --update bash
 
 #copy all versions of kubectl to switch between them later.
+COPY --from=builder kubectl1.22 /usr/local/bin/
+COPY --from=builder kubectl1.21 /usr/local/bin/
+COPY --from=builder kubectl1.20 /usr/local/bin/
+COPY --from=builder kubectl1.19 /usr/local/bin/
+COPY --from=builder kubectl1.18 /usr/local/bin/
+COPY --from=builder kubectl1.17 /usr/local/bin/
 COPY --from=builder kubectl1.16 /usr/local/bin/
 COPY --from=builder kubectl1.15 /usr/local/bin/
 COPY --from=builder kubectl1.14 /usr/local/bin/
@@ -27,7 +39,20 @@ 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.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
+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 \
+    /usr/local/bin/kubectl1.17 \
+    /usr/local/bin/kubectl1.18 \
+    /usr/local/bin/kubectl1.19 \
+    /usr/local/bin/kubectl1.20 \
+    /usr/local/bin/kubectl1.21 \
+    /usr/local/bin/kubectl1.22 
 
 WORKDIR /
 

README.md

@@ -26,7 +26,7 @@ The following env variables control the deployment configuration:
 
 Optional:
 
-`SERVER_VERSION` - Manually set the Minor kubectl version.  Supports 10-16.
+`SERVER_VERSION` - Manually set the Minor kubectl version.  Supports 10-22.
 
 # Usage in codefresh.io
 

cf-deploy-kubernetes.sh

@@ -51,7 +51,14 @@ else
     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" == "15" )); then cp -f /usr/local/bin/kubectl1.15 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "16" )); then cp -f /usr/local/bin/kubectl1.16 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "17" )); then cp -f /usr/local/bin/kubectl1.17 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "18" )); then cp -f /usr/local/bin/kubectl1.18 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "19" )); then cp -f /usr/local/bin/kubectl1.19 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "20" )); then cp -f /usr/local/bin/kubectl1.20 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" == "21" )); then cp -f /usr/local/bin/kubectl1.21 /usr/local/bin/kubectl; fi 2>/dev/null
+    if (( "$SERVER_VERSION" >= "22" )); then cp -f /usr/local/bin/kubectl1.22 /usr/local/bin/kubectl; fi 2>/dev/null
     [ ! -f "${deployment_file}" ] && echo "Couldn't find $deployment_file file at $(pwd)" && exit 1;
 fi
 

service.yaml

@@ -1,2 +1 @@
-version: 16.1.4
-
+version: 16.1.5